procyberian/tdesktop
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 5

Moved position info from ItemBases to AbstractLayoutItem.

Browse source
This commit is contained in:
23rd 2021-07-26 01:37:06 +03:00
parent 2256482ae0
commit c82006c6f8
7 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
View file

@ -120,7 +120,7 @@ void Gif::initDimensions() {
}
void Gif::setPosition(int32 position) {
ItemBase::setPosition(position);
AbstractLayoutItem::setPosition(position);
if (_position < 0) {
_gif.reset();
}
@ -1358,7 +1358,7 @@ void Game::initDimensions() {
}
void Game::setPosition(int32 position) {
ItemBase::setPosition(position);
AbstractLayoutItem::setPosition(position);
if (_position < 0) {
_gif.reset();
}

8
Telegram/SourceFiles/inline_bots/inline_bot_layout_item.cpp
View file

@ -28,14 +28,6 @@ NeverFreedPointer<DocumentItems> documentItemsMap;
} // namespace
void ItemBase::setPosition(int32 position) {
_position = position;
}
int32 ItemBase::position() const {
return _position;
}
Result *ItemBase::getResult() const {
return _result;
}

5
Telegram/SourceFiles/inline_bots/inline_bot_layout_item.h
View file

@ -77,9 +77,6 @@ public:
virtual void paint(Painter &p, const QRect &clip, const PaintContext *context) const = 0;
virtual void setPosition(int32 position);
int32 position() const;
virtual bool isFullLine() const {
return true;
}
@ -144,8 +141,6 @@ protected:
ClickHandlerPtr _send = ClickHandlerPtr{ new SendClickHandler() };
ClickHandlerPtr _open = ClickHandlerPtr{ new OpenFileClickHandler() };
int _position = 0; // < 0 means removed from layout
private:
not_null<Context*> _context;
mutable std::shared_ptr<Data::CloudImageView> _thumbnail;

7
Telegram/SourceFiles/layout/abstract_layout_item.cpp
View file

@ -30,6 +30,13 @@ int AbstractLayoutItem::height() const {
return _height;
}
void AbstractLayoutItem::setPosition(int position) {
_position = position;
}
int AbstractLayoutItem::position() const {
return _position;
}
bool AbstractLayoutItem::hasPoint(QPoint point) const {
return QRect(0, 0, width(), height()).contains(point);
}

4
Telegram/SourceFiles/layout/abstract_layout_item.h
View file

@ -27,6 +27,9 @@ public:
[[nodiscard]] int width() const;
[[nodiscard]] int height() const;
virtual void setPosition(int position);
[[nodiscard]] int position() const;
[[nodiscard]] bool hasPoint(QPoint point) const;
virtual ~AbstractLayoutItem();
@ -36,5 +39,6 @@ protected:
int _height = 0;
int _maxw = 0;
int _minh = 0;
int _position = 0; // < 0 means removed from layout
};

2
Telegram/SourceFiles/overview/overview_layout.cpp
View file

@ -2063,7 +2063,7 @@ void Gif::clearHeavyPart() {
}
void Gif::setPosition(int32 position) {
ItemBase::setPosition(position);
AbstractLayoutItem::setPosition(position);
if (position < 0) {
_gif.reset();
}

10
Telegram/SourceFiles/overview/overview_layout.h
View file

@ -54,13 +54,6 @@ public:
QDateTime dateTime() const;
void setPosition(int position) {
_position = position;
}
int position() const {
return _position;
}
HistoryItem *getItem() const {
return _parent;
}
@ -94,7 +87,6 @@ private:
const not_null<HistoryItem*> _parent;
const QDateTime _dateTime;
std::unique_ptr<Checkbox> _check;
int _position = 0;
};
@ -225,7 +217,7 @@ public:
StateRequest request) const override;
void clearHeavyPart() override;
void setPosition(int32 position);
void setPosition(int32 position) override;
protected:
float64 dataProgress() const override;