procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix switching between stickers pan and panel. 

Fixes #4537.
This commit is contained in:
John Preston 2018-03-26 00:34:13 +04:00
parent 6904e023d3
commit d4bd8862bd
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Telegram/SourceFiles/chat_helpers/stickers_list_widget.cpp
View File

@ -63,7 +63,9 @@ public:
Footer(not_null<StickersListWidget*> parent); Footer(not_null<StickersListWidget*> parent);
void preloadImages(); void preloadImages();
void validateSelectedIcon(uint64 setId, ValidateIconAnimations animations); void validateSelectedIcon(
uint64 setId,
ValidateIconAnimations animations);
void refreshIcons(ValidateIconAnimations animations); void refreshIcons(ValidateIconAnimations animations);
bool hasOnlyFeaturedSets() const; bool hasOnlyFeaturedSets() const;
@ -99,6 +101,7 @@ private:
int newSelected, int newSelected,
ValidateIconAnimations animations); ValidateIconAnimations animations);
void refreshIconsGeometry(ValidateIconAnimations animations);
void updateSelected(); void updateSelected();
void finishDragging(); void finishDragging();
void paintStickerSettingsIcon(Painter &p) const; void paintStickerSettingsIcon(Painter &p) const;
@ -389,6 +392,7 @@ void StickersListWidget::Footer::resizeEvent(QResizeEvent *e) {
if (_searchField) { if (_searchField) {
resizeSearchControls(); resizeSearchControls();
} }
refreshIconsGeometry(ValidateIconAnimations::None);
} }
void StickersListWidget::Footer::resizeSearchControls() { void StickersListWidget::Footer::resizeSearchControls() {
@ -543,10 +547,11 @@ void StickersListWidget::Footer::updateSelected() {
if (y >= _iconsTop if (y >= _iconsTop
&& y < _iconsTop + st::emojiFooterHeight && y < _iconsTop + st::emojiFooterHeight
&& x >= _iconsLeft && x >= _iconsLeft
&& x < width() - _iconsRight && x < width() - _iconsRight) {
&& x < _icons.size() * st::stickerIconWidth) {
x += qRound(_iconsX.current()) - _iconsLeft; x += qRound(_iconsX.current()) - _iconsLeft;
newOver = qFloor(x / st::stickerIconWidth); if (x < _icons.size() * st::stickerIconWidth) {
newOver = qFloor(x / st::stickerIconWidth);
}
} }
} }
if (newOver != _iconOver) { if (newOver != _iconOver) {
@ -561,8 +566,13 @@ void StickersListWidget::Footer::updateSelected() {
void StickersListWidget::Footer::refreshIcons( void StickersListWidget::Footer::refreshIcons(
ValidateIconAnimations animations) { ValidateIconAnimations animations) {
_iconOver = SpecialOver::None;
_pan->fillIcons(_icons); _pan->fillIcons(_icons);
refreshIconsGeometry(animations);
}
void StickersListWidget::Footer::refreshIconsGeometry(
ValidateIconAnimations animations) {
_iconOver = _iconDown = SpecialOver::None;
_iconsX.finish(); _iconsX.finish();
_iconSelX.finish(); _iconSelX.finish();
_iconsStartAnim = 0; _iconsStartAnim = 0;