diff --git a/Telegram/Resources/basic.style b/Telegram/Resources/basic.style index 866c89334..44d123c2c 100644 --- a/Telegram/Resources/basic.style +++ b/Telegram/Resources/basic.style @@ -1025,20 +1025,6 @@ topBarActionButton: flatButton(btnDefNext, btnDefBig) { } topBarActionSkip: 13px; -historyToEnd: iconedButton(btnDefIconed) { - bgColor: transparent; - overBgColor: transparent; - - icon: sprite(252px, 41px, 44px, 44px); - iconPos: point(0px, 0px); - downIcon: sprite(252px, 41px, 44px, 44px); - downIconPos: point(0px, 0px); - - width: 44px; - height: 44px; -} -historyToEndSkip: 10px; - activeFadeInDuration: 500; activeFadeOutDuration: 3000; diff --git a/Telegram/Resources/icons/history_down_arrow.png b/Telegram/Resources/icons/history_down_arrow.png new file mode 100644 index 000000000..d47721fa1 Binary files /dev/null and b/Telegram/Resources/icons/history_down_arrow.png differ diff --git a/Telegram/Resources/icons/history_down_arrow@2x.png b/Telegram/Resources/icons/history_down_arrow@2x.png new file mode 100644 index 000000000..085877e03 Binary files /dev/null and b/Telegram/Resources/icons/history_down_arrow@2x.png differ diff --git a/Telegram/Resources/icons/history_down_circle.png b/Telegram/Resources/icons/history_down_circle.png new file mode 100644 index 000000000..f94e8dd7b Binary files /dev/null and b/Telegram/Resources/icons/history_down_circle.png differ diff --git a/Telegram/Resources/icons/history_down_circle@2x.png b/Telegram/Resources/icons/history_down_circle@2x.png new file mode 100644 index 000000000..94492dada Binary files /dev/null and b/Telegram/Resources/icons/history_down_circle@2x.png differ diff --git a/Telegram/Resources/icons/history_down_shadow.png b/Telegram/Resources/icons/history_down_shadow.png new file mode 100644 index 000000000..8317b07d1 Binary files /dev/null and b/Telegram/Resources/icons/history_down_shadow.png differ diff --git a/Telegram/Resources/icons/history_down_shadow@2x.png b/Telegram/Resources/icons/history_down_shadow@2x.png new file mode 100644 index 000000000..8127513da Binary files /dev/null and b/Telegram/Resources/icons/history_down_shadow@2x.png differ diff --git a/Telegram/SourceFiles/history/history.style b/Telegram/SourceFiles/history/history.style new file mode 100644 index 000000000..1e7a72cc2 --- /dev/null +++ b/Telegram/SourceFiles/history/history.style @@ -0,0 +1,30 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +using "basic.style"; + +historyToDown: icon { + { "history_down_shadow", #00000040 }, + { "history_down_circle", #fff, point(2px, 1px) }, +}; +historyToDownPosition: point(12px, 10px); +historyToDownArrow: icon { + { "history_down_arrow", #b9b9b9, point(14px, 19px) }, +}; diff --git a/Telegram/SourceFiles/historywidget.cpp b/Telegram/SourceFiles/historywidget.cpp index f8f6679e7..6299afb66 100644 --- a/Telegram/SourceFiles/historywidget.cpp +++ b/Telegram/SourceFiles/historywidget.cpp @@ -21,10 +21,12 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org #include "stdafx.h" #include "historywidget.h" +#include "styles/style_history.h" #include "boxes/confirmbox.h" #include "boxes/photosendbox.h" #include "ui/filedialog.h" #include "ui/toast/toast.h" +#include "ui/buttons/history_down_button.h" #include "inline_bots/inline_bot_result.h" #include "lang.h" #include "application.h" @@ -2826,7 +2828,7 @@ TextWithTags::Tags textTagsFromEntities(const EntitiesInText &entities) { HistoryWidget::HistoryWidget(QWidget *parent) : TWidget(parent) , _fieldBarCancel(this, st::replyCancel) , _scroll(this, st::historyScroll, false) -, _toHistoryEnd(this, st::historyToEnd) +, _historyToEnd(this) , _collapseComments(this) , _fieldAutocomplete(this) , _reportSpamPanel(this) @@ -2866,7 +2868,7 @@ HistoryWidget::HistoryWidget(QWidget *parent) : TWidget(parent) connect(&_reportSpamPanel, SIGNAL(reportClicked()), this, SLOT(onReportSpamClicked())); connect(&_reportSpamPanel, SIGNAL(hideClicked()), this, SLOT(onReportSpamHide())); connect(&_reportSpamPanel, SIGNAL(clearClicked()), this, SLOT(onReportSpamClear())); - connect(&_toHistoryEnd, SIGNAL(clicked()), this, SLOT(onHistoryToEnd())); + connect(_historyToEnd, SIGNAL(clicked()), this, SLOT(onHistoryToEnd())); connect(&_collapseComments, SIGNAL(clicked()), this, SLOT(onCollapseComments())); connect(&_fieldBarCancel, SIGNAL(clicked()), this, SLOT(onFieldBarCancel())); connect(&_send, SIGNAL(clicked()), this, SLOT(onSend())); @@ -2931,8 +2933,8 @@ HistoryWidget::HistoryWidget(QWidget *parent) : TWidget(parent) updateScrollColors(); - _toHistoryEnd.hide(); - _toHistoryEnd.installEventFilter(this); + _historyToEnd->hide(); + _historyToEnd->installEventFilter(this); _collapseComments.hide(); _collapseComments.installEventFilter(this); @@ -4110,7 +4112,7 @@ void HistoryWidget::updateControlsVisibility() { _attachEmoji.hide(); _broadcast.hide(); _silent.hide(); - _toHistoryEnd.hide(); + _historyToEnd->hide(); _collapseComments.hide(); _kbShow.hide(); _kbHide.hide(); @@ -5138,7 +5140,7 @@ void HistoryWidget::animShow(const QPixmap &bgAnimCache, const QPixmap &bgAnimTo _scroll.hide(); _kbScroll.hide(); _reportSpamPanel.hide(); - _toHistoryEnd.hide(); + _historyToEnd->hide(); _collapseComments.hide(); _attachDocument.hide(); _attachPhoto.hide(); @@ -5562,7 +5564,7 @@ bool HistoryWidget::insertBotCommand(const QString &cmd, bool specialGif) { } bool HistoryWidget::eventFilter(QObject *obj, QEvent *e) { - if ((obj == &_toHistoryEnd || obj == &_collapseComments) && e->type() == QEvent::Wheel) { + if ((obj == _historyToEnd || obj == &_collapseComments) && e->type() == QEvent::Wheel) { return _scroll.viewportEvent(e); } return TWidget::eventFilter(obj, e); @@ -6624,7 +6626,7 @@ void HistoryWidget::resizeEvent(QResizeEvent *e) { updateFieldSize(); - _toHistoryEnd.move((width() - _toHistoryEnd.width()) / 2, _scroll.y() + _scroll.height() - _toHistoryEnd.height() - st::historyToEndSkip); + _historyToEnd->moveToRight(st::historyToDownPosition.x(), _scroll.y() + _scroll.height() - _historyToEnd->height() - st::historyToDownPosition.y()); updateCollapseCommentsVisibility(); _emojiPan.setMaxHeight(height() - st::dropdownDef.padding.top() - st::dropdownDef.padding.bottom() - _attachEmoji.height()); @@ -6726,7 +6728,7 @@ void HistoryWidget::updateListSize(bool initial, bool loadedDown, const ScrollCh } _fieldAutocomplete->setBoundings(_scroll.geometry()); - _toHistoryEnd.move((width() - _toHistoryEnd.width()) / 2, _scroll.y() + _scroll.height() - _toHistoryEnd.height() - st::historyToEndSkip); + _historyToEnd->moveToRight(st::historyToDownPosition.x(), _scroll.y() + _scroll.height() - _historyToEnd->height() - st::historyToDownPosition.y()); updateCollapseCommentsVisibility(); } @@ -7005,10 +7007,10 @@ void HistoryWidget::updateBotKeyboard(History *h, bool force) { void HistoryWidget::updateToEndVisibility() { bool toEndVisible = !_a_show.animating() && _history && !_firstLoadRequest && (!_history->loadedAtBottom() || _replyReturn || _scroll.scrollTop() + st::wndMinHeight < _scroll.scrollTopMax()); - if (toEndVisible && _toHistoryEnd.isHidden()) { - _toHistoryEnd.show(); - } else if (!toEndVisible && !_toHistoryEnd.isHidden()) { - _toHistoryEnd.hide(); + if (toEndVisible && _historyToEnd->isHidden()) { + _historyToEnd->show(); + } else if (!toEndVisible && !_historyToEnd->isHidden()) { + _historyToEnd->hide(); } } diff --git a/Telegram/SourceFiles/historywidget.h b/Telegram/SourceFiles/historywidget.h index 270145286..2312d3308 100644 --- a/Telegram/SourceFiles/historywidget.h +++ b/Telegram/SourceFiles/historywidget.h @@ -33,6 +33,10 @@ class ItemBase; class Result; } // namespace InlineBots +namespace Ui { +class HistoryDownButton; +} // namespace Ui + class HistoryWidget; class HistoryInner : public TWidget, public AbstractTooltipShower { Q_OBJECT @@ -1017,7 +1021,7 @@ private: uint64 _lastScrolled = 0; QTimer _updateHistoryItems; - IconedButton _toHistoryEnd; + ChildWidget _historyToEnd; CollapseButton _collapseComments; ChildWidget _fieldAutocomplete; diff --git a/Telegram/SourceFiles/ui/buttons/history_down_button.cpp b/Telegram/SourceFiles/ui/buttons/history_down_button.cpp new file mode 100644 index 000000000..8d1135757 --- /dev/null +++ b/Telegram/SourceFiles/ui/buttons/history_down_button.cpp @@ -0,0 +1,68 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#include "stdafx.h" +#include "ui/buttons/history_down_button.h" + +#include "styles/style_history.h" + +namespace Ui { + +HistoryDownButton::HistoryDownButton(QWidget *parent) : Button(parent) +, a_arrowOpacity(st::btnAttachEmoji.opacity, st::btnAttachEmoji.opacity) +, _a_arrowOver(animation(this, &HistoryDownButton::step_arrowOver)) { + setCursor(style::cur_pointer); + resize(st::historyToDown.width(), st::historyToDown.height()); + + connect(this, SIGNAL(stateChanged(int,ButtonStateChangeSource)), this, SLOT(onStateChange(int,ButtonStateChangeSource))); +} + +void HistoryDownButton::paintEvent(QPaintEvent *e) { + Painter p(this); + st::historyToDown.paint(p, QPoint(0, 0), width()); + p.setOpacity(a_arrowOpacity.current()); + st::historyToDownArrow.paint(p, QPoint(0, 0), width()); +} + +void HistoryDownButton::onStateChange(int oldState, ButtonStateChangeSource source) { + a_arrowOpacity.start((_state & (StateOver | StateDown)) ? st::btnAttachEmoji.overOpacity : st::btnAttachEmoji.opacity); + + if (source == ButtonByUser || source == ButtonByPress) { + _a_arrowOver.stop(); + a_arrowOpacity.finish(); + update(); + } else { + _a_arrowOver.start(); + } +} + +void HistoryDownButton::step_arrowOver(float64 ms, bool timer) { + float64 dt = ms / st::btnAttachEmoji.duration; + if (dt >= 1) { + _a_arrowOver.stop(); + a_arrowOpacity.finish(); + } else { + a_arrowOpacity.update(dt, anim::linear); + } + if (timer) update(); +} + + +} // namespace Ui diff --git a/Telegram/SourceFiles/ui/buttons/history_down_button.h b/Telegram/SourceFiles/ui/buttons/history_down_button.h new file mode 100644 index 000000000..c472439ab --- /dev/null +++ b/Telegram/SourceFiles/ui/buttons/history_down_button.h @@ -0,0 +1,47 @@ +/* +This file is part of Telegram Desktop, +the official desktop version of Telegram messaging app, see https://telegram.org + +Telegram Desktop is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +It is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +In addition, as a special exception, the copyright holders give permission +to link the code of portions of this program with the OpenSSL library. + +Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE +Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org +*/ +#pragma once + +#include "ui/button.h" + +namespace Ui { + +class HistoryDownButton : public Button { + Q_OBJECT + +public: + HistoryDownButton(QWidget *parent); + +protected: + void paintEvent(QPaintEvent *e) override; + +private slots: + void onStateChange(int oldState, ButtonStateChangeSource source); + +private: + void step_arrowOver(float64 ms, bool timer); + + anim::fvalue a_arrowOpacity; + Animation _a_arrowOver; + +}; + +} // namespace Ui diff --git a/Telegram/SourceFiles/ui/buttons/peer_avatar_button.h b/Telegram/SourceFiles/ui/buttons/peer_avatar_button.h index 114581e00..eca0f3122 100644 --- a/Telegram/SourceFiles/ui/buttons/peer_avatar_button.h +++ b/Telegram/SourceFiles/ui/buttons/peer_avatar_button.h @@ -29,11 +29,14 @@ namespace Ui { class PeerAvatarButton : public Button { public: PeerAvatarButton(QWidget *parent, PeerData *peer, const style::PeerAvatarButton &st); + void setPeer(PeerData *peer) { _peer = peer; update(); } - void paintEvent(QPaintEvent *e); + +protected: + void paintEvent(QPaintEvent *e) override; private: PeerData *_peer; diff --git a/Telegram/Telegram.vcxproj b/Telegram/Telegram.vcxproj index 8936c0643..72d35e0f7 100644 --- a/Telegram/Telegram.vcxproj +++ b/Telegram/Telegram.vcxproj @@ -310,6 +310,10 @@ true true + + true + true + true true @@ -601,6 +605,10 @@ true true + + true + true + true true @@ -918,6 +926,10 @@ true true + + true + true + true true @@ -1063,6 +1075,7 @@ + @@ -1174,6 +1187,7 @@ + @@ -1269,6 +1283,7 @@ + @@ -1448,6 +1463,20 @@ .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore\5.6.0\QtCore" "-I$(QTDIR)\include\QtGui\5.6.0\QtGui" "-I.\..\..\Libraries\breakpad\src" "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\ThirdParty\minizip" "-I.\..\..\Libraries\openssl\Release\include" "-fstdafx.h" "-f../../SourceFiles/ui/countryinput.h" + + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing history_down_button.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/ui/buttons/history_down_button.h" -DAL_LIBTYPE_STATIC -DCUSTOM_API_ID -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore\5.6.0\QtCore" "-I$(QTDIR)\include\QtGui\5.6.0\QtGui" "-I.\..\..\Libraries\breakpad\src" "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\ThirdParty\minizip" "-I.\..\..\Libraries\openssl\Release\include" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing history_down_button.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/ui/buttons/history_down_button.h" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -D_SCL_SECURE_NO_WARNINGS "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore\5.6.0\QtCore" "-I$(QTDIR)\include\QtGui\5.6.0\QtGui" "-I.\..\..\Libraries\breakpad\src" "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\ThirdParty\minizip" "-I.\..\..\Libraries\openssl_debug\Debug\include" + $(QTDIR)\bin\moc.exe;%(FullPath) + Moc%27ing history_down_button.h... + .\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp + "$(QTDIR)\bin\moc.exe" "%(FullPath)" -o ".\GeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp" "-fstdafx.h" "-f../../SourceFiles/ui/buttons/history_down_button.h" -DAL_LIBTYPE_STATIC -DUNICODE -DWIN32 -DWIN64 -DHAVE_STDINT_H -DZLIB_WINAPI -DQT_NO_DEBUG -DNDEBUG -D_SCL_SECURE_NO_WARNINGS "-I.\SourceFiles" "-I.\GeneratedFiles" "-I.\GeneratedFiles\$(ConfigurationName)\." "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtCore\5.6.0\QtCore" "-I$(QTDIR)\include\QtGui\5.6.0\QtGui" "-I.\..\..\Libraries\breakpad\src" "-I.\..\..\Libraries\lzma\C" "-I.\..\..\Libraries\libexif-0.6.20" "-I.\..\..\Libraries\zlib-1.2.8" "-I.\..\..\Libraries\ffmpeg" "-I.\..\..\Libraries\openal-soft\include" "-I.\ThirdParty\minizip" "-I.\..\..\Libraries\openssl\Release\include" + @@ -2428,6 +2457,7 @@ Compiling style %(Identity)... + diff --git a/Telegram/Telegram.vcxproj.filters b/Telegram/Telegram.vcxproj.filters index b585b9a90..78319ff25 100644 --- a/Telegram/Telegram.vcxproj.filters +++ b/Telegram/Telegram.vcxproj.filters @@ -1116,6 +1116,21 @@ GeneratedFiles\Release + + GeneratedFiles\styles + + + SourceFiles\ui\buttons + + + GeneratedFiles\Deploy + + + GeneratedFiles\Debug + + + GeneratedFiles\Release + @@ -1289,6 +1304,9 @@ Resources\winrc + + GeneratedFiles\styles + @@ -1531,6 +1549,9 @@ Resources\langs + + SourceFiles\ui\buttons + @@ -1600,6 +1621,9 @@ SourceFiles\overview + + SourceFiles\history +