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

inline bot results determine emojipan height

This commit is contained in:
John Preston 2016-01-02 10:52:36 +08:00
parent 6fe380ff9f
commit 2f130ff223
3 changed files with 63 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
Telegram/SourceFiles/dropdown.cpp
View File

@ -2420,7 +2420,7 @@ void StickerPanInner::updateShowingSavedGifs() {
if (_inlineRows.isEmpty()) refreshSavedGifs(); if (_inlineRows.isEmpty()) refreshSavedGifs();
} }
} else if (!_showingInlineItems) { } else if (!_showingInlineItems) {
_showingSavedGifs = _showingInlineItems = false; _showingSavedGifs = false;
} }
} }
@ -2544,8 +2544,10 @@ void EmojiSwitchButton::paintEvent(QPaintEvent *e) {
EmojiPan::EmojiPan(QWidget *parent) : TWidget(parent) EmojiPan::EmojiPan(QWidget *parent) : TWidget(parent)
, _maxHeight(st::emojiPanMaxHeight) , _maxHeight(st::emojiPanMaxHeight)
, _maxHeightEmoji(_maxHeight - st::rbEmoji.height) , _contentMaxHeight(st::emojiPanMaxHeight)
, _maxHeightStickers(_maxHeight - st::rbEmoji.height) , _contentHeight(_contentMaxHeight)
, _contentHeightEmoji(_contentHeight - st::rbEmoji.height)
, _contentHeightStickers(_contentHeight - st::rbEmoji.height)
, _horizontal(false) , _horizontal(false)
, _noTabUpdate(false) , _noTabUpdate(false)
, _hiding(false) , _hiding(false)
@ -2574,7 +2576,6 @@ EmojiPan::EmojiPan(QWidget *parent) : TWidget(parent)
, _iconsStartAnim(0) , _iconsStartAnim(0)
, _stickersShown(false) , _stickersShown(false)
, _shownFromInlineQuery(false) , _shownFromInlineQuery(false)
, _contentMaxHeight(st::emojiPanMaxHeight)
, _a_slide(animation(this, &EmojiPan::step_slide)) , _a_slide(animation(this, &EmojiPan::step_slide))
, e_scroll(this, st::emojiScroll) , e_scroll(this, st::emojiScroll)
, e_inner() , e_inner()
@ -2592,11 +2593,12 @@ EmojiPan::EmojiPan(QWidget *parent) : TWidget(parent)
s_scroll.viewport()->setFocusPolicy(Qt::NoFocus); s_scroll.viewport()->setFocusPolicy(Qt::NoFocus);
_width = st::dropdownDef.padding.left() + st::emojiPanWidth + st::dropdownDef.padding.right(); _width = st::dropdownDef.padding.left() + st::emojiPanWidth + st::dropdownDef.padding.right();
_height = st::dropdownDef.padding.top() + _maxHeight + st::dropdownDef.padding.bottom(); _height = st::dropdownDef.padding.top() + _contentHeight + st::dropdownDef.padding.bottom();
_bottom = 0;
resize(_width, _height); resize(_width, _height);
e_scroll.resize(st::emojiPanWidth, _maxHeightEmoji); e_scroll.resize(st::emojiPanWidth, _contentHeightEmoji);
s_scroll.resize(st::emojiPanWidth, _maxHeightStickers); s_scroll.resize(st::emojiPanWidth, _contentHeightStickers);
e_scroll.move(st::dropdownDef.padding.left(), st::dropdownDef.padding.top()); e_scroll.move(st::dropdownDef.padding.left(), st::dropdownDef.padding.top());
e_scroll.setWidget(&e_inner); e_scroll.setWidget(&e_inner);
@ -2607,7 +2609,7 @@ EmojiPan::EmojiPan(QWidget *parent) : TWidget(parent)
s_inner.moveToLeft(0, 0, s_scroll.width()); s_inner.moveToLeft(0, 0, s_scroll.width());
int32 left = _iconsLeft = st::dropdownDef.padding.left() + (st::emojiPanWidth - 8 * st::rbEmoji.width) / 2; int32 left = _iconsLeft = st::dropdownDef.padding.left() + (st::emojiPanWidth - 8 * st::rbEmoji.width) / 2;
int32 top = _iconsTop = st::dropdownDef.padding.top() + _maxHeight - st::rbEmoji.height; int32 top = _iconsTop = st::dropdownDef.padding.top() + _contentHeight - st::rbEmoji.height;
prepareTab(left, top, _width, _recent); prepareTab(left, top, _width, _recent);
prepareTab(left, top, _width, _people); prepareTab(left, top, _width, _people);
prepareTab(left, top, _width, _nature); prepareTab(left, top, _width, _nature);
@ -2666,32 +2668,39 @@ EmojiPan::EmojiPan(QWidget *parent) : TWidget(parent)
} }
void EmojiPan::setMaxHeight(int32 h) { void EmojiPan::setMaxHeight(int32 h) {
h = qMin(_contentMaxHeight, h); _maxHeight = h;
updateContentHeight();
}
void EmojiPan::updateContentHeight() {
int32 h = qMin(_contentMaxHeight, _maxHeight);
int32 he = h - st::rbEmoji.height; int32 he = h - st::rbEmoji.height;
int32 hs = h - (s_inner.showSectionIcons() ? st::rbEmoji.height : 0); int32 hs = h - (s_inner.showSectionIcons() ? st::rbEmoji.height : 0);
if (h == _maxHeight && he == _maxHeightEmoji && hs == _maxHeightStickers) return; if (h == _contentHeight && he == _contentHeightEmoji && hs == _contentHeightStickers) return;
int32 was = _maxHeight, wase = _maxHeightEmoji, wass = _maxHeightStickers; int32 was = _contentHeight, wase = _contentHeightEmoji, wass = _contentHeightStickers;
_maxHeight = h; _contentHeight = h;
_maxHeightEmoji = he; _contentHeightEmoji = he;
_maxHeightStickers = hs; _contentHeightStickers = hs;
_height = st::dropdownDef.padding.top() + _contentHeight + st::dropdownDef.padding.bottom();
_height = st::dropdownDef.padding.top() + _maxHeight + st::dropdownDef.padding.bottom();
resize(_width, _height); resize(_width, _height);
move(x(), _bottom - height());
if (was > _maxHeight || (was == _maxHeight && wass > _maxHeightStickers)) { if (was > _contentHeight || (was == _contentHeight && wass > _contentHeightStickers)) {
e_scroll.resize(st::emojiPanWidth, _maxHeightEmoji); e_scroll.resize(st::emojiPanWidth, _contentHeightEmoji);
s_scroll.resize(st::emojiPanWidth, _maxHeightStickers); s_scroll.resize(st::emojiPanWidth, _contentHeightStickers);
s_inner.setMaxHeight(_maxHeightStickers); s_inner.setMaxHeight(_contentHeightStickers);
e_inner.setMaxHeight(_maxHeightEmoji); e_inner.setMaxHeight(_contentHeightEmoji);
} else { } else {
s_inner.setMaxHeight(_maxHeightStickers); s_inner.setMaxHeight(_contentHeightStickers);
e_inner.setMaxHeight(_maxHeightEmoji); e_inner.setMaxHeight(_contentHeightEmoji);
e_scroll.resize(st::emojiPanWidth, _maxHeightEmoji); e_scroll.resize(st::emojiPanWidth, _contentHeightEmoji);
s_scroll.resize(st::emojiPanWidth, _maxHeightStickers); s_scroll.resize(st::emojiPanWidth, _contentHeightStickers);
} }
_iconsTop = st::dropdownDef.padding.top() + _maxHeight - st::rbEmoji.height; _iconsTop = st::dropdownDef.padding.top() + _contentHeight - st::rbEmoji.height;
_recent.move(_recent.x(), _iconsTop); _recent.move(_recent.x(), _iconsTop);
_people.move(_people.x(), _iconsTop); _people.move(_people.x(), _iconsTop);
_nature.move(_nature.x(), _iconsTop); _nature.move(_nature.x(), _iconsTop);
@ -2832,14 +2841,15 @@ void EmojiPan::paintEvent(QPaintEvent *e) {
} }
void EmojiPan::moveBottom(int32 bottom, bool force) { void EmojiPan::moveBottom(int32 bottom, bool force) {
_bottom = bottom;
if (isHidden() && !force) { if (isHidden() && !force) {
move(x(), bottom - height()); move(x(), _bottom - height());
return; return;
} }
if (_stickersShown && s_inner.inlineResultsShown()) { if (_stickersShown && s_inner.inlineResultsShown()) {
moveToLeft(0, bottom - height()); moveToLeft(0, _bottom - height());
} else { } else {
moveToRight(0, bottom - height()); moveToRight(0, _bottom - height());
} }
} }
@ -3016,7 +3026,7 @@ void EmojiPan::onRefreshIcons() {
updateSelected(); updateSelected();
if (_stickersShown) { if (_stickersShown) {
validateSelectedIcon(); validateSelectedIcon();
setMaxHeight(_maxHeight); updateContentHeight();
} }
updateIcons(); updateIcons();
} }
@ -3240,15 +3250,13 @@ void EmojiPan::showStart() {
if (s_inner.inlineResultsShown() && refreshInlineRows()) { if (s_inner.inlineResultsShown() && refreshInlineRows()) {
_stickersShown = true; _stickersShown = true;
_shownFromInlineQuery = true; _shownFromInlineQuery = true;
_contentMaxHeight = qMin(s_inner.countHeight(true), int(st::emojiPanMaxHeight));
} else { } else {
s_inner.refreshRecent(); s_inner.refreshRecent();
_stickersShown = false; _stickersShown = false;
_shownFromInlineQuery = false; _shownFromInlineQuery = false;
_contentMaxHeight = st::emojiPanMaxHeight;
} }
recountContentMaxHeight();
s_inner.preloadImages(); s_inner.preloadImages();
setMaxHeight(_maxHeight);
_fromCache = _toCache = QPixmap(); _fromCache = _toCache = QPixmap();
_a_slide.stop(); _a_slide.stop();
moveBottom(y() + height(), true); moveBottom(y() + height(), true);
@ -3307,7 +3315,7 @@ void EmojiPan::stickersInstalled(uint64 setId) {
} }
showAll(); showAll();
s_inner.showStickerSet(setId); s_inner.showStickerSet(setId);
setMaxHeight(_maxHeight); updateContentHeight();
showStart(); showStart();
} }
@ -3484,7 +3492,7 @@ void EmojiPan::onSwitch() {
s_inner.showFinish(); s_inner.showFinish();
} }
validateSelectedIcon(); validateSelectedIcon();
setMaxHeight(_maxHeight); updateContentHeight();
} }
_iconOver = -1; _iconOver = -1;
_iconHovers = _icons.isEmpty() ? QVector<float64>() : QVector<float64>(_icons.size(), 0); _iconHovers = _icons.isEmpty() ? QVector<float64>() : QVector<float64>(_icons.size(), 0);
@ -3584,6 +3592,7 @@ void EmojiPan::inlineBotChanged() {
} }
_inlineCache.clear(); _inlineCache.clear();
s_inner.inlineBotChanged(); s_inner.inlineBotChanged();
s_inner.hideInlineRowsPanel();
Notify::inlineBotRequesting(false); Notify::inlineBotRequesting(false);
} }
@ -3731,7 +3740,7 @@ void EmojiPan::onInlineRequest() {
} }
void EmojiPan::onEmptyInlineRows() { void EmojiPan::onEmptyInlineRows() {
if (_shownFromInlineQuery) { if (_shownFromInlineQuery || _stickersShown) {
hideAnimated(); hideAnimated();
} else { } else {
s_inner.hideInlineRowsPanel(); s_inner.hideInlineRowsPanel();
@ -3758,11 +3767,10 @@ void EmojiPan::showInlineRows(bool newResults) {
e_switch.moveToRight(0, 0, st::emojiPanWidth); e_switch.moveToRight(0, 0, st::emojiPanWidth);
bool hidden = isHidden(); bool hidden = isHidden();
if (!hidden && _shownFromInlineQuery && !clear) { if (!hidden && !clear) {
_contentMaxHeight = qMax(s_inner.countHeight(true), int(st::emojiPanMaxHeight)); recountContentMaxHeight();
setMaxHeight(_maxHeight);
} }
if (clear && !hidden && _stickersShown && s_inner.inlineResultsShown()) { if (clear && !hidden && _stickersShown) {
hideAnimated(); hideAnimated();
} else if (!clear) { } else if (!clear) {
_hideTimer.stop(); _hideTimer.stop();
@ -3774,6 +3782,15 @@ void EmojiPan::showInlineRows(bool newResults) {
} }
} }
void EmojiPan::recountContentMaxHeight() {
if (_shownFromInlineQuery) {
_contentMaxHeight = qMin(s_inner.countHeight(true), int(st::emojiPanMaxHeight));
} else {
_contentMaxHeight = st::emojiPanMaxHeight;
}
updateContentHeight();
}
MentionsInner::MentionsInner(MentionsDropdown *parent, MentionRows *mrows, HashtagRows *hrows, BotCommandRows *brows) MentionsInner::MentionsInner(MentionsDropdown *parent, MentionRows *mrows, HashtagRows *hrows, BotCommandRows *brows)
: _parent(parent) : _parent(parent)
, _mrows(mrows) , _mrows(mrows)

7
Telegram/SourceFiles/dropdown.h
View File

@ -625,8 +625,9 @@ private:
void validateSelectedIcon(bool animated = false); void validateSelectedIcon(bool animated = false);
int32 _maxHeight, _maxHeightEmoji, _maxHeightStickers; int32 _maxHeight, _contentMaxHeight, _contentHeight, _contentHeightEmoji, _contentHeightStickers;
bool _horizontal; bool _horizontal;
void updateContentHeight();
void leaveToChildEvent(QEvent *e); void leaveToChildEvent(QEvent *e);
void hideAnimated(); void hideAnimated();
@ -642,7 +643,7 @@ private:
bool _noTabUpdate; bool _noTabUpdate;
int32 _width, _height; int32 _width, _height, _bottom;
bool _hiding; bool _hiding;
QPixmap _cache; QPixmap _cache;
@ -668,7 +669,6 @@ private:
uint64 _iconsStartAnim; uint64 _iconsStartAnim;
bool _stickersShown, _shownFromInlineQuery; bool _stickersShown, _shownFromInlineQuery;
int32 _contentMaxHeight;
QPixmap _fromCache, _toCache; QPixmap _fromCache, _toCache;
anim::ivalue a_fromCoord, a_toCoord; anim::ivalue a_fromCoord, a_toCoord;
anim::fvalue a_fromAlpha, a_toAlpha; anim::fvalue a_fromAlpha, a_toAlpha;
@ -707,6 +707,7 @@ private:
void inlineBotChanged(); void inlineBotChanged();
void showInlineRows(bool newResults); void showInlineRows(bool newResults);
void recountContentMaxHeight();
bool refreshInlineRows(); bool refreshInlineRows();
UserData *_inlineBot; UserData *_inlineBot;
QString _inlineQuery, _inlineNextQuery, _inlineNextOffset; QString _inlineQuery, _inlineNextQuery, _inlineNextOffset;

5
Telegram/SourceFiles/historywidget.cpp
View File

@ -3560,6 +3560,7 @@ void HistoryWidget::showHistory(const PeerId &peerId, MsgId showAtMsgId, bool re
connect(&_scroll, SIGNAL(geometryChanged()), _list, SLOT(onParentGeometryChanged())); connect(&_scroll, SIGNAL(geometryChanged()), _list, SLOT(onParentGeometryChanged()));
connect(&_scroll, SIGNAL(scrolled()), _list, SLOT(onUpdateSelected())); connect(&_scroll, SIGNAL(scrolled()), _list, SLOT(onUpdateSelected()));
} else { } else {
setFieldText(QString());
doneShow(); doneShow();
} }
@ -5037,7 +5038,7 @@ void HistoryWidget::inlineBotResolveDone(const MTPcontacts_ResolvedPeer &result)
App::feedUsers(d.vusers); App::feedUsers(d.vusers);
App::feedChats(d.vchats); App::feedChats(d.vchats);
} }
onCheckMentionDropdown(); updateInlineBotQuery();
} }
bool HistoryWidget::inlineBotResolveFail(QString name, const RPCError &error) { bool HistoryWidget::inlineBotResolveFail(QString name, const RPCError &error) {
@ -5896,8 +5897,8 @@ void HistoryWidget::resizeEvent(QResizeEvent *e) {
_cmdStart.move(_attachEmoji.x() - _cmdStart.width(), height() - kbh - _cmdStart.height()); _cmdStart.move(_attachEmoji.x() - _cmdStart.width(), height() - kbh - _cmdStart.height());
_attachType.move(0, _attachDocument.y() - _attachType.height()); _attachType.move(0, _attachDocument.y() - _attachType.height());
_emojiPan.setMaxHeight(height() - st::dropdownDef.padding.top() - st::dropdownDef.padding.bottom() - _attachEmoji.height());
_emojiPan.moveBottom(_attachEmoji.y()); _emojiPan.moveBottom(_attachEmoji.y());
_emojiPan.setMaxHeight(height() - st::dropdownDef.padding.top() - st::dropdownDef.padding.bottom() - _attachEmoji.height());
switch (_attachDrag) { switch (_attachDrag) {
case DragStateFiles: case DragStateFiles: