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

Closed beta 10019002: redesign, fix emoji pan hide after inline bot.

This commit is contained in:
John Preston 2016-11-06 21:08:52 +03:00
parent b3d1602354
commit dac96bfc4a
8 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Telegram/Resources/winrc/Telegram.rc
View File

@ -34,8 +34,8 @@ IDI_ICON1 ICON "..\\art\\icon256.ico"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,19,1 FILEVERSION 0,10,19,2
PRODUCTVERSION 0,10,19,1 PRODUCTVERSION 0,10,19,2
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -51,10 +51,10 @@ BEGIN
BLOCK "040904b0" BLOCK "040904b0"
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileVersion", "0.10.19.1" VALUE "FileVersion", "0.10.19.2"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.19.1" VALUE "ProductVersion", "0.10.19.2"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

8
Telegram/Resources/winrc/Updater.rc
View File

@ -25,8 +25,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,10,19,1 FILEVERSION 0,10,19,2
PRODUCTVERSION 0,10,19,1 PRODUCTVERSION 0,10,19,2
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -43,10 +43,10 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Telegram Messenger LLP" VALUE "CompanyName", "Telegram Messenger LLP"
VALUE "FileDescription", "Telegram Updater" VALUE "FileDescription", "Telegram Updater"
VALUE "FileVersion", "0.10.19.1" VALUE "FileVersion", "0.10.19.2"
VALUE "LegalCopyright", "Copyright (C) 2014-2016" VALUE "LegalCopyright", "Copyright (C) 2014-2016"
VALUE "ProductName", "Telegram Desktop" VALUE "ProductName", "Telegram Desktop"
VALUE "ProductVersion", "0.10.19.1" VALUE "ProductVersion", "0.10.19.2"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

2
Telegram/SourceFiles/core/version.h
View File

@ -22,7 +22,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
#include "core/utils.h" #include "core/utils.h"
#define BETA_VERSION_MACRO (10019001ULL) #define BETA_VERSION_MACRO (10019002ULL)
constexpr int AppVersion = 10020; constexpr int AppVersion = 10020;
constexpr str_const AppVersionStr = "0.10.20"; constexpr str_const AppVersionStr = "0.10.20";

1
Telegram/SourceFiles/historywidget.cpp
View File

@ -7561,7 +7561,6 @@ void HistoryWidget::updatePinnedBar(bool force) {
} }
} }
t_assert(_history != nullptr); t_assert(_history != nullptr);
if (!_pinnedBar->msg) { if (!_pinnedBar->msg) {
_pinnedBar->msg = App::histItemById(_history->channelId(), _pinnedBar->msgId); _pinnedBar->msg = App::histItemById(_history->channelId(), _pinnedBar->msgId);
} }

5
Telegram/SourceFiles/layerwidget.cpp
View File

@ -501,6 +501,7 @@ void MediaPreviewWidget::showPreview(PhotoData *photo) {
startShow(); startShow();
_photo = photo; _photo = photo;
_document = nullptr; _document = nullptr;
fillEmojiString();
resetGifAndCache(); resetGifAndCache();
} }
@ -548,7 +549,9 @@ void MediaPreviewWidget::fillEmojiString() {
return result; return result;
}; };
if (auto sticker = _document->sticker()) { if (_photo) {
_emojiList.clear();
} else if (auto sticker = _document->sticker()) {
auto &inputSet = sticker->set; auto &inputSet = sticker->set;
if (inputSet.type() == mtpc_inputStickerSetID) { if (inputSet.type() == mtpc_inputStickerSetID) {
_emojiList = getStickerEmojiList(inputSet.c_inputStickerSetID().vid.v); _emojiList = getStickerEmojiList(inputSet.c_inputStickerSetID().vid.v);

12
Telegram/SourceFiles/stickers/emoji_pan.cpp
View File

@ -2597,7 +2597,7 @@ EmojiPan::EmojiPan(QWidget *parent) : TWidget(parent)
setCurrentTabIcon(dbietRecent); setCurrentTabIcon(dbietRecent);
_hideTimer.setSingleShot(true); _hideTimer.setSingleShot(true);
connect(&_hideTimer, SIGNAL(timeout()), this, SLOT(hideAnimated())); connect(&_hideTimer, SIGNAL(timeout()), this, SLOT(hideByTimerOrLeave()));
connect(&e_inner, SIGNAL(scrollToY(int)), &e_scroll, SLOT(scrollToY(int))); connect(&e_inner, SIGNAL(scrollToY(int)), &e_scroll, SLOT(scrollToY(int)));
connect(&e_inner, SIGNAL(disableScroll(bool)), &e_scroll, SLOT(disableScroll(bool))); connect(&e_inner, SIGNAL(disableScroll(bool)), &e_scroll, SLOT(disableScroll(bool)));
@ -2865,7 +2865,7 @@ bool EmojiPan::preventAutoHide() const {
void EmojiPan::leaveEvent(QEvent *e) { void EmojiPan::leaveEvent(QEvent *e) {
if (preventAutoHide() || s_inner.inlineResultsShown()) return; if (preventAutoHide() || s_inner.inlineResultsShown()) return;
if (_a_appearance.animating()) { if (_a_appearance.animating()) {
hideAnimated(); hideByTimerOrLeave();
} else { } else {
_hideTimer.start(300); _hideTimer.start(300);
} }
@ -2879,7 +2879,7 @@ void EmojiPan::otherEnter() {
void EmojiPan::otherLeave() { void EmojiPan::otherLeave() {
if (preventAutoHide() || s_inner.inlineResultsShown()) return; if (preventAutoHide() || s_inner.inlineResultsShown()) return;
if (_a_appearance.animating()) { if (_a_appearance.animating()) {
hideAnimated(); hideByTimerOrLeave();
} else { } else {
_hideTimer.start(0); _hideTimer.start(0);
} }
@ -3177,10 +3177,10 @@ void EmojiPan::step_appearance(float64 ms, bool timer) {
if (timer) update(); if (timer) update();
} }
void EmojiPan::hideAnimated() { void EmojiPan::hideByTimerOrLeave() {
if (isHidden() || preventAutoHide() || s_inner.inlineResultsShown()) return; if (isHidden() || preventAutoHide() || s_inner.inlineResultsShown()) return;
startHideAnimated(); hideAnimated();
} }
void EmojiPan::prepareShowHideCache() { void EmojiPan::prepareShowHideCache() {
@ -3193,7 +3193,7 @@ void EmojiPan::prepareShowHideCache() {
} }
} }
void EmojiPan::startHideAnimated() { void EmojiPan::hideAnimated() {
if (_hiding) return; if (_hiding) return;
prepareShowHideCache(); prepareShowHideCache();

4
Telegram/SourceFiles/stickers/emoji_pan.h
View File

@ -536,13 +536,14 @@ public:
return s_inner.inlineResultsShown(); return s_inner.inlineResultsShown();
} }
public slots:
void showAnimated(); void showAnimated();
void hideAnimated(); void hideAnimated();
public slots:
void refreshStickers(); void refreshStickers();
private slots: private slots:
void hideByTimerOrLeave();
void refreshSavedGifs(); void refreshSavedGifs();
void hideFinish(); void hideFinish();
@ -595,7 +596,6 @@ private:
void updateContentHeight(); void updateContentHeight();
void leaveToChildEvent(QEvent *e, QWidget *child); void leaveToChildEvent(QEvent *e, QWidget *child);
void startHideAnimated();
void prepareShowHideCache(); void prepareShowHideCache();
void updateSelected(); void updateSelected();

2
Telegram/build/version
View File

@ -3,4 +3,4 @@ AppVersionStrMajor 0.10
AppVersionStrSmall 0.10.20 AppVersionStrSmall 0.10.20
AppVersionStr 0.10.20 AppVersionStr 0.10.20
AlphaChannel 0 AlphaChannel 0
BetaVersion 10019001 BetaVersion 10019002