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

Improve Emoji-Stickers-GIFs panel. 

Fix broken minimal panel size.
Remove HistoryWidget context menu from the panel.
This commit is contained in:
John Preston 2017-04-16 00:05:57 +03:00
parent 6226cf2809
commit 8e241e8b78
6 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Telegram/SourceFiles/chat_helpers/tabbed_panel.cpp
View File

@ -98,8 +98,10 @@ void TabbedPanel::updateContentHeight() {
} }
auto addedHeight = innerPadding().top() + innerPadding().bottom(); auto addedHeight = innerPadding().top() + innerPadding().bottom();
auto wantedContentHeight = qRound(st::emojiPanHeightRatio * _bottom) - addedHeight; auto marginsHeight = _selector->marginTop() + _selector->marginBottom();
auto contentHeight = snap(wantedContentHeight, st::emojiPanMinHeight, st::emojiPanMaxHeight); auto availableHeight = _bottom - marginsHeight;
auto wantedContentHeight = qRound(st::emojiPanHeightRatio * availableHeight) - addedHeight;
auto contentHeight = marginsHeight + snap(wantedContentHeight, st::emojiPanMinHeight, st::emojiPanMaxHeight);
auto resultTop = _bottom - addedHeight - contentHeight; auto resultTop = _bottom - addedHeight - contentHeight;
if (contentHeight == _contentHeight) { if (contentHeight == _contentHeight) {
move(x(), resultTop); move(x(), resultTop);

5
Telegram/SourceFiles/chat_helpers/tabbed_selector.h
View File

@ -61,6 +61,9 @@ public:
void beforeHiding(); void beforeHiding();
void afterShown(); void afterShown();
int marginTop() const;
int marginBottom() const;
bool preventAutoHide() const; bool preventAutoHide() const;
bool isSliding() const { bool isSliding() const {
return _a_slide.animating(); return _a_slide.animating();
@ -135,8 +138,6 @@ private:
}; };
int marginTop() const;
int marginBottom() const;
void paintSlideFrame(Painter &p, TimeMs ms); void paintSlideFrame(Painter &p, TimeMs ms);
void paintContent(Painter &p); void paintContent(Painter &p);

4
Telegram/SourceFiles/history/history_inner_widget.cpp
View File

@ -1200,6 +1200,10 @@ void HistoryInner::mouseDoubleClickEvent(QMouseEvent *e) {
} }
} }
void HistoryInner::contextMenuEvent(QContextMenuEvent *e) {
showContextMenu(e);
}
void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) { void HistoryInner::showContextMenu(QContextMenuEvent *e, bool showFromTouch) {
if (_menu) { if (_menu) {
_menu->deleteLater(); _menu->deleteLater();

5
Telegram/SourceFiles/history/history_inner_widget.h
View File

@ -41,8 +41,6 @@ public:
void messagesReceived(PeerData *peer, const QVector<MTPMessage> &messages); void messagesReceived(PeerData *peer, const QVector<MTPMessage> &messages);
void messagesReceivedDown(PeerData *peer, const QVector<MTPMessage> &messages); void messagesReceivedDown(PeerData *peer, const QVector<MTPMessage> &messages);
void showContextMenu(QContextMenuEvent *e, bool showFromTouch = false);
TextWithEntities getSelectedText() const; TextWithEntities getSelectedText() const;
void dragActionStart(const QPoint &screenPos, Qt::MouseButton button = Qt::LeftButton); void dragActionStart(const QPoint &screenPos, Qt::MouseButton button = Qt::LeftButton);
@ -108,6 +106,7 @@ protected:
void leaveEventHook(QEvent *e) override; void leaveEventHook(QEvent *e) override;
void resizeEvent(QResizeEvent *e) override; void resizeEvent(QResizeEvent *e) override;
void keyPressEvent(QKeyEvent *e) override; void keyPressEvent(QKeyEvent *e) override;
void contextMenuEvent(QContextMenuEvent *e) override;
public slots: public slots:
void onUpdateSelected(); void onUpdateSelected();
@ -131,6 +130,8 @@ protected:
void onScrollDateHideByTimer(); void onScrollDateHideByTimer();
private: private:
void showContextMenu(QContextMenuEvent *e, bool showFromTouch = false);
void itemRemoved(HistoryItem *item); void itemRemoved(HistoryItem *item);
void savePhotoToFile(PhotoData *photo); void savePhotoToFile(PhotoData *photo);
void saveDocumentToFile(DocumentData *document); void saveDocumentToFile(DocumentData *document);

6
Telegram/SourceFiles/historywidget.cpp
View File

@ -3610,12 +3610,6 @@ void HistoryWidget::onCmdStart() {
setFieldText({ qsl("/"), TextWithTags::Tags() }, 0, Ui::FlatTextarea::AddToUndoHistory); setFieldText({ qsl("/"), TextWithTags::Tags() }, 0, Ui::FlatTextarea::AddToUndoHistory);
} }
void HistoryWidget::contextMenuEvent(QContextMenuEvent *e) {
if (!_list) return;
return _list->showContextMenu(e);
}
void HistoryWidget::forwardMessage() { void HistoryWidget::forwardMessage() {
auto item = App::contextItem(); auto item = App::contextItem();
if (!item || item->id < 0 || item->serviceMsg()) return; if (!item || item->id < 0 || item->serviceMsg()) return;

1
Telegram/SourceFiles/historywidget.h
View File

@ -363,7 +363,6 @@ protected:
void leaveEventHook(QEvent *e) override; void leaveEventHook(QEvent *e) override;
void mouseReleaseEvent(QMouseEvent *e) override; void mouseReleaseEvent(QMouseEvent *e) override;
void mouseMoveEvent(QMouseEvent *e) override; void mouseMoveEvent(QMouseEvent *e) override;
void contextMenuEvent(QContextMenuEvent *e) override;
signals: signals:
void cancelled(); void cancelled();