From d2048f3c257407cb483b14539762a88c0115287b Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 7 May 2018 20:44:33 +0300 Subject: [PATCH] New connecting status design. --- Telegram/Resources/basic.style | 2 - Telegram/Resources/icons/connecting_body.png | Bin 0 -> 95 bytes .../Resources/icons/connecting_body@2x.png | Bin 0 -> 112 bytes .../icons/connecting_body_shadow.png | Bin 0 -> 117 bytes .../icons/connecting_body_shadow@2x.png | Bin 0 -> 151 bytes Telegram/Resources/icons/connecting_left.png | Bin 0 -> 357 bytes .../Resources/icons/connecting_left@2x.png | Bin 0 -> 717 bytes .../icons/connecting_left_shadow.png | Bin 0 -> 550 bytes .../icons/connecting_left_shadow@2x.png | Bin 0 -> 1089 bytes Telegram/Resources/icons/connecting_right.png | Bin 0 -> 347 bytes .../Resources/icons/connecting_right@2x.png | Bin 0 -> 679 bytes .../icons/connecting_right_shadow.png | Bin 0 -> 573 bytes .../icons/connecting_right_shadow@2x.png | Bin 0 -> 1143 bytes Telegram/Resources/icons/proxy_off.png | Bin 0 -> 529 bytes Telegram/Resources/icons/proxy_off@2x.png | Bin 0 -> 1012 bytes Telegram/Resources/icons/proxy_on.png | Bin 0 -> 584 bytes Telegram/Resources/icons/proxy_on@2x.png | Bin 0 -> 1121 bytes Telegram/SourceFiles/app.cpp | 3 - .../SourceFiles/dialogs/dialogs_widget.cpp | 10 + Telegram/SourceFiles/dialogs/dialogs_widget.h | 3 + .../SourceFiles/info/info_section_widget.cpp | 10 + .../SourceFiles/info/info_section_widget.h | 5 + .../SourceFiles/info/info_wrap_widget.cpp | 5 + Telegram/SourceFiles/info/info_wrap_widget.h | 3 + Telegram/SourceFiles/intro/introwidget.cpp | 12 + Telegram/SourceFiles/intro/introwidget.h | 7 + Telegram/SourceFiles/mainwidget.cpp | 11 + Telegram/SourceFiles/mainwidget.h | 3 + Telegram/SourceFiles/mainwindow.cpp | 90 --- Telegram/SourceFiles/mainwindow.h | 27 - Telegram/SourceFiles/messenger.cpp | 6 +- .../settings/settings_advanced_widget.cpp | 1 - .../ui/effects/radial_animation.cpp | 12 +- .../SourceFiles/ui/effects/radial_animation.h | 5 + Telegram/SourceFiles/ui/rp_widget.h | 5 +- Telegram/SourceFiles/ui/widgets/buttons.cpp | 28 +- Telegram/SourceFiles/ui/widgets/buttons.h | 2 +- Telegram/SourceFiles/ui/widgets/widgets.style | 1 + Telegram/SourceFiles/window/window.style | 21 + .../window/window_connecting_widget.cpp | 523 ++++++++++++++++++ .../window/window_connecting_widget.h | 100 ++++ Telegram/gyp/telegram_sources.txt | 2 + 42 files changed, 758 insertions(+), 139 deletions(-) create mode 100644 Telegram/Resources/icons/connecting_body.png create mode 100644 Telegram/Resources/icons/connecting_body@2x.png create mode 100644 Telegram/Resources/icons/connecting_body_shadow.png create mode 100644 Telegram/Resources/icons/connecting_body_shadow@2x.png create mode 100644 Telegram/Resources/icons/connecting_left.png create mode 100644 Telegram/Resources/icons/connecting_left@2x.png create mode 100644 Telegram/Resources/icons/connecting_left_shadow.png create mode 100644 Telegram/Resources/icons/connecting_left_shadow@2x.png create mode 100644 Telegram/Resources/icons/connecting_right.png create mode 100644 Telegram/Resources/icons/connecting_right@2x.png create mode 100644 Telegram/Resources/icons/connecting_right_shadow.png create mode 100644 Telegram/Resources/icons/connecting_right_shadow@2x.png create mode 100644 Telegram/Resources/icons/proxy_off.png create mode 100644 Telegram/Resources/icons/proxy_off@2x.png create mode 100644 Telegram/Resources/icons/proxy_on.png create mode 100644 Telegram/Resources/icons/proxy_on@2x.png create mode 100644 Telegram/SourceFiles/window/window_connecting_widget.cpp create mode 100644 Telegram/SourceFiles/window/window_connecting_widget.h diff --git a/Telegram/Resources/basic.style b/Telegram/Resources/basic.style index 6310cd226..0515d0140 100644 --- a/Telegram/Resources/basic.style +++ b/Telegram/Resources/basic.style @@ -215,8 +215,6 @@ emojiReplaceHeight: 56px; emojiReplaceInnerHeight: 42px; emojiReplacePadding: 14px; -connectingPadding: margins(5px, 5px, 5px, 5px); - dragFont: font(28px semibold); dragSubfont: font(20px semibold); dragColor: windowSubTextFg; diff --git a/Telegram/Resources/icons/connecting_body.png b/Telegram/Resources/icons/connecting_body.png new file mode 100644 index 0000000000000000000000000000000000000000..293c1e8d20599c74ba2517cb07c11546c90870d6 GIT binary patch literal 95 zcmeAS@N?(olHy`uVBq!ia0vp^EI_Qm!3HF6&W|<*Qfi(qjv*QolT#8Bew=S$nIUn3 tL6S-5|NsBT*C&M}{NOS$x}f06$l(8+)o0RP-)%r044$rjF6*2UngCMS8>#>R literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/connecting_body@2x.png b/Telegram/Resources/icons/connecting_body@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d5a9ac629bb74ee7b41027b6ea467909d1271c1e GIT binary patch literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^96%hv!3HE%E|~}dDRWO3#}JRss+19jTF$2Td+pKen1&up_Mlg7~ L`njxgN@xNAL}noO literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/connecting_body_shadow.png b/Telegram/Resources/icons/connecting_body_shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..713f78630eace05b448b57d3aab823e461e37cbb GIT binary patch literal 117 zcmeAS@N?(olHy`uVBq!ia0vp^EI_Qm!3HF6&W|<*QZ}A0jv*QolT#8Bew=S$nIUn3 zA(2rmFfcHLk(--a=&XdOgc*~Lyj_ihV8WD1lbk%0dt_u}Rxt6j1Sv8c{Kb*8Xq(e1 Ppg9blu6{1-oD!M<0XZHr literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/connecting_body_shadow@2x.png b/Telegram/Resources/icons/connecting_body_shadow@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..7cc19ea5c131714d3cc3e3f51c7d3bceb74032c1 GIT binary patch literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^96%hv!3HE%E|~}dsW?v;#}JRsx7Q504g_#82Z;U@ z|Dbj6zf+(5!L@g-(te6Wd4$Qc%vq#V#M!a%ael+>#K-UY99y|6(6XcL2{tDnm{r-UW|Hd-=a literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/connecting_left.png b/Telegram/Resources/icons/connecting_left.png new file mode 100644 index 0000000000000000000000000000000000000000..a292c9bace2450dbd606cfa3baae3e5a74c375d2 GIT binary patch literal 357 zcmV-r0h<1aP)}AUV|8M+H(U)?P zOFx}-=kwhFKmlUBVPgLje0RO*c^>3>4q28#nx+s%5irI8;IqoshcTwAs#43cC|z6v zg%E0*CM|RcB!sB8ZSO+XAR$C`U1x<^flbp`V-LZiC@x`lLB^Px=lL>dZ0xcuAq+#y zuKXFlvZIt5`^+gr&N&1@;FO&abPX+-Bnd7U$FVbb1I-t(?>kURoxr~tu-mrbg5x;i zg2OQ2f_>jRg8+u7x2`MR(>sm>q?C9W!V}}m2mJnuQ{Ax=iEE~lwpss=tB1~YwvcHiaW71#Rk;zfts;=mO< zE;OuKHR<)Pg^!&;%KH2JoeCB*tiHO+ASPkKV+*Ik#)h`U3(ub~-*aI1ZtI6Twl*G3 zG8DRV>p?af zK{5}7D=I5BPaW*}tsfRDDlaeZp(51eS%2KN`T6tb6CX3kABfRYzjUxiIwNwL2fK0J zg3MV;vS)TQ9zT8@OwU@@Sz_?G?#!RMeD`@@j_2Pwa5F~@r2a+aJdpYaw{On|(Kx4>5|y+CCxX#>16g=FGP2%U}Ne>uYak4-`ua z%D+>~toZvPJHxIWJ0?hT-0Z*KaFpF~CBFgVg{xPm-f>_ES$*{h8!&+G=7q;8Fj(2x zEP4Jsy|R%(W3J!j3Y%%-91VPYd@C-$Ji*Q4P+eVJQeCaBUtqc9?}ER@FLwF$x;e)^ zC=%gn-6}3Ikzu;>{PUOp{Gtv$&Z)0boBy)>wkt@+?7Ym0@?kEP)`45P_s_a9F-Bq(1GINxdg8r`g0MNWB|MqVG}9pfEJh4E zCiXi({_T&HQV1a+gaGFpob&!5Aq0#u_`Z+HWP&tJF`Lcc`#w15pp3BQ49n&6CDaLYSdt{j^BhqWeLP7k_=s({TPUSIV!)eg!x%#x z$H?=%Gu8@HN}-fOmSvre`4%LEKnQ^(Nsy*#FRT?*N@2ZTzwKsckaLbGiV%ijZ|n&q zgg{D(#bNSu=N== z#^83lp(qLf_u8&jD|nvwwhXPHwf5&;x@^m`#C$$Sk|ZF6yo3opY_NoopH0j6eMC`& zIF6yUhSvI@VQj7a47#9{f-wdm1f-M*f&fY>1VI2PB|Oi&&(f}-%hs)QZYOjTo-ua+ o-Us|2f1L2{4gVT!i_s_cU*-I#lI9Q_x&QzG07*qoM6N<$f_N|ZJOBUy literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/connecting_left_shadow@2x.png b/Telegram/Resources/icons/connecting_left_shadow@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d6fa4c87e6bd131313a4d7d98f0a2fd0b9557f47 GIT binary patch literal 1089 zcmV-H1it%;P)P^TEANdQ~_w;ah!V7k68m$0aPHy7(CAdW31lPX?)gFE20H?RK4RjRx41V^T`2 zRx7-{z2V{E;pS`i2Grq%5D3E%udlCoetw4Q_Uj9J0qTvw_kBcBg!lJ%%;)o7V7&qL zkovxl<#LISkB^&jZBW1_xXosR{eBN2#9(m14TFUyxb=EH3f$FzO%3Al@o_Y`s{w)k z>m27CVHje+-w&E|x{Lu;=RD7Yl(Kh?Gm#PCrM%m0HlxA;S2{@UQ6cVIgiX|WhbH%S zyB(yIqr(ALgjjXYMrcV!4ys+*X0sWsq%^4&P#>BHL4fsoZHooiSqyZ>}HwXeeJv~_iBN;nL<2>8y1f=pZo6W#Ex5ZVfHN^U$UiI`~?-Vj} zkfx4Ps1uOpwu~{GT(yiGq-_ed=Ac?;^v7bhWIUR=JHRQSR2e&1Rnx5Z7-jxcaDV|| zRaGd<5@lK1;Q6JCfK^r1&Xr|(zag%w3Pn*M&vP3*ztjjwZjp;cQ6NbYt6-$g5SL|% zJkJrwu}!X8oq*)v`Fx(Fp%^(xA2$K*SULfzkx(8U4hO46yEViBemIzA8NR>2t-5%XgL$4KNfLa0eOb#z zBS5vgOOga}99wJASB+-!Jg*ze;c&3h{TYu3)pC=jDdITB=jZ3>p=JR7UGob~Q-RrR zHrn*ScrMxG;^}n4@p#1Ha2N#+FkA{#OHNS~KjzHp+?8PSZJAmSMeK!}Izt=-=cZ0X7|@6v*?ue%-_>U>l^~ z^Ux4&xm@1t=FKtCA=U9Cxk!-b^BG|nB8nmiA+8z?^-2`#yva2!a5<@Bc~x0v`mBAnB7J>18n;miB3Z zh<--rs~x~#fGViIgr>tbz44|#$^CJSp#cd}g{7OSuuY%px%D;10K5dMhF^dF-3T|9 zgO^}00qbe;*rYq)TIw}e|^W_KO6MZ-2?sy<-!1yW`4wb00000NkvXX Hu0mjflzIge literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/connecting_right.png b/Telegram/Resources/icons/connecting_right.png new file mode 100644 index 0000000000000000000000000000000000000000..a57b9a55940c24cd816839ea80ff1a0676827b0c GIT binary patch literal 347 zcmV-h0i^zkP)CFq!U9}N5GxQot1PHD(Zip^%gZGu@tJ`b^21(s zmXCp*`DZjD0x{}^6ZTJmw`EyqnkH)7ma3|vvMi}63fi{q91%Mjh5>OL!?G;Uy$X(> zJ>WxK*C7l;KHx)HmOR*~Db tZ8VPK`?4gZ{L!+cy^+~;9Y6fLz*khdfPQ>EeVYIP002ovPDHLkV1n-2nnVBq literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/connecting_right@2x.png b/Telegram/Resources/icons/connecting_right@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..f38785766913b9057c9651d2d213192890697b0f GIT binary patch literal 679 zcmV;Y0$BZtP)TRWF9FbL0-)0bK&J_SP7?+|hr@wP z)1>F;XVP_@w%aYKs!EH+g7*8pTp@mlWm%ZbW@xoqxVpLm{ry|?_xcI=9oz5sQ7jgD z0>5TDouXVW^97!Ae}9iuD#aHF0H$f8Ua#{7o^o?@gGeO87YG2u;SkYilrInfR8>VH zk>Cpi08P_yd3nhf2mqte$erJ$S3m&hcDuZR0GvO9yapPEflMaD7YG2oUXM2r04kLV zZ=j+mynz6I^{VFUD}Sfcu{|aP03KNW8OyRLlgZHQ>#Oh>U+-Wz9HwToX={w{v$|TX zW~=Y(S4>27JRT_?j|6omUyChqxsUbrg-n9JpayHbGH*Vn>bDZq3( zE!>p?jKyNYUEd!wpC23w3H8`7zexce4hP|`6rgFE!d)rAmzNjet`wlI>%v_rz|CeO z+?4{1zgqfh`;n5&MaIu=H_CwOZv1WWD@m7>2Wr zNUwp7M&tK5uYq@Wcg}EL0wd5-`9 N002ovPDHLkV1iu_GK2sC literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/connecting_right_shadow.png b/Telegram/Resources/icons/connecting_right_shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..e5738cbb40fec842819fcaf9ddb55a5742390608 GIT binary patch literal 573 zcmV-D0>b@?P)# zL2Ii(6otPT6^kUbNNH&nA!HW_bld;`LrOOdk~V0K#4$6@yp^H6*fg;&+Pf6|IG1z1 z_b33zfF*~7{SBahdwUCjF$QA{T5Gh{SZn(MpPrtu)?$o7DMglLyuH0qmL*Clnx?_I z^L_J$5O|)4=Xr!-NF2vZr&IDg=jG*vJkJl{vw&R>rIaK|!p+SMX`1r<{7hMv7-POw zd(spsC6md7$HzyKB*FK6gb@9KZH>ocmdoW?(6h%TiXs+^1=rWtc%JujV5@XKpA$t9 zQg*+3@nGNG-H{{-K@fDdelbu=$!s=rrUaU<>=K zt~by*$7;1AO;fhp?a8RpdFVfvF^1J@#d^J_C<^MjKAC&I1PUS8Y&N{VzmsJdWmz6z zr_zJ}833TQrYH*XJf|oMw%aXAsY9FJMG-&CGOV@i_j~HPrm8A-yB$?kQP(wEYnrAx zJKl+hhX?1JqiLGM2j6DJ*2zoaoVdEWa=@V-YwcOBeF@~Z{{{R5#0^gD7pe%s00000 LNkvXXu0mjfAHoiL literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/connecting_right_shadow@2x.png b/Telegram/Resources/icons/connecting_right_shadow@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..efc009fec3d69e9573ef76cb00d9c87a2d0c5412 GIT binary patch literal 1143 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 literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp index f93551069..81f402f2d 100644 --- a/Telegram/SourceFiles/app.cpp +++ b/Telegram/SourceFiles/app.cpp @@ -168,9 +168,6 @@ namespace { cSetOtherOnline(0); clearStorageImages(); - if (auto w = wnd()) { - w->updateConnectingStatus(); - } return true; } } // namespace diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp index c0c4b74c0..6972b8f1c 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.cpp +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.cpp @@ -27,6 +27,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/peer_list_box.h" #include "window/window_controller.h" #include "window/window_slide_animation.h" +#include "window/window_connecting_widget.h" #include "profile/profile_channel_controllers.h" #include "storage/storage_media_prepare.h" #include "data/data_session.h" @@ -170,6 +171,13 @@ DialogsWidget::DialogsWidget(QWidget *parent, not_null cont updateJumpToDateVisibility(true); updateSearchFromVisibility(true); + setupConnectingWidget(); +} + +void DialogsWidget::setupConnectingWidget() { + _connecting = Window::ConnectingWidget::CreateDefaultWidget( + this, + Window::AdaptiveIsOneColumn()); } #ifndef TDESKTOP_DISABLE_AUTOUPDATE @@ -282,6 +290,7 @@ void DialogsWidget::showAnimated(Window::SlideDirection direction, const Window: _jumpToDate->hide(anim::type::instant); _chooseFromUser->hide(anim::type::instant); _lockUnlock->hide(); + _connecting->setForceHidden(true); int delta = st::slideShift; if (_showDirection == Window::SlideDirection::FromLeft) { @@ -307,6 +316,7 @@ void DialogsWidget::animationCallback() { _mainMenuToggle->show(); if (_forwardCancel) _forwardCancel->show(); _filter->show(); + _connecting->setForceHidden(false); updateLockUnlockVisibility(); updateJumpToDateVisibility(true); updateSearchFromVisibility(true); diff --git a/Telegram/SourceFiles/dialogs/dialogs_widget.h b/Telegram/SourceFiles/dialogs/dialogs_widget.h index 715751bf0..bc069e279 100644 --- a/Telegram/SourceFiles/dialogs/dialogs_widget.h +++ b/Telegram/SourceFiles/dialogs/dialogs_widget.h @@ -34,6 +34,7 @@ class FadeWrapScaled; namespace Window { class Controller; +class ConnectingWidget; } // namespace Window enum DialogsSearchRequestType { @@ -151,6 +152,7 @@ private: const QVector &dialogs, const QVector &messages); + void setupConnectingWidget(); bool searchForPeersRequired(const QString &query) const; void setSearchInChat(Dialogs::Key chat, UserData *from = nullptr); void showJumpToDate(); @@ -194,6 +196,7 @@ private: QPointer _inner; class UpdateButton; object_ptr _updateTelegram = { nullptr }; + base::unique_qptr _connecting; Animation _a_show; Window::SlideDirection _showDirection; diff --git a/Telegram/SourceFiles/info/info_section_widget.cpp b/Telegram/SourceFiles/info/info_section_widget.cpp index 8124ebb30..5edee8198 100644 --- a/Telegram/SourceFiles/info/info_section_widget.cpp +++ b/Telegram/SourceFiles/info/info_section_widget.cpp @@ -7,6 +7,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL */ #include "info/info_section_widget.h" +#include "window/window_connecting_widget.h" #include "info/info_content_widget.h" #include "info/info_wrap_widget.h" #include "info/info_layer_widget.h" @@ -42,6 +43,15 @@ void SectionWidget::init() { auto additionalScroll = 0; wrap->updateGeometry(wrapGeometry, additionalScroll); }, _content->lifetime()); + + _connecting = Window::ConnectingWidget::CreateDefaultWidget( + _content.data(), + Window::AdaptiveIsOneColumn()); + + _content->contentChanged( + ) | rpl::start_with_next([=] { + _connecting->raise(); + }, _connecting->lifetime()); } Dialogs::RowDescriptor SectionWidget::activeChat() const { diff --git a/Telegram/SourceFiles/info/info_section_widget.h b/Telegram/SourceFiles/info/info_section_widget.h index 86a50912f..605cadca6 100644 --- a/Telegram/SourceFiles/info/info_section_widget.h +++ b/Telegram/SourceFiles/info/info_section_widget.h @@ -14,6 +14,10 @@ namespace Ui { class SettingsSlider; } // namespace Ui +namespace Window { +class ConnectingWidget; +} // namespace Window + namespace Info { class Memento; @@ -65,6 +69,7 @@ private: object_ptr _content; object_ptr _topBarSurrogate = { nullptr }; + base::unique_qptr _connecting; }; diff --git a/Telegram/SourceFiles/info/info_wrap_widget.cpp b/Telegram/SourceFiles/info/info_wrap_widget.cpp index c4abd4c82..2c6ae9e81 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.cpp +++ b/Telegram/SourceFiles/info/info_wrap_widget.cpp @@ -582,6 +582,7 @@ void WrapWidget::finishShowContent() { _scrollTillBottomChanges.fire(_content->scrollTillBottomChanges()); _topShadow->raise(); _topShadow->finishAnimating(); + _contentChanges.fire({}); // This was done for tabs support. // @@ -680,6 +681,10 @@ void WrapWidget::setWrap(Wrap wrap) { _wrap = wrap; } +rpl::producer<> WrapWidget::contentChanged() const { + return _contentChanges.events(); +} + bool WrapWidget::hasTopBarShadow() const { return _topShadow->toggled(); } diff --git a/Telegram/SourceFiles/info/info_wrap_widget.h b/Telegram/SourceFiles/info/info_wrap_widget.h index 915db2e46..a7d5504a6 100644 --- a/Telegram/SourceFiles/info/info_wrap_widget.h +++ b/Telegram/SourceFiles/info/info_wrap_widget.h @@ -90,6 +90,8 @@ public: rpl::producer wrapValue() const; void setWrap(Wrap wrap); + rpl::producer<> contentChanged() const; + not_null controller() { return _controller.get(); } @@ -217,6 +219,7 @@ private: rpl::event_stream> _desiredShadowVisibilities; rpl::event_stream> _selectedLists; rpl::event_stream> _scrollTillBottomChanges; + rpl::event_stream<> _contentChanges; }; diff --git a/Telegram/SourceFiles/intro/introwidget.cpp b/Telegram/SourceFiles/intro/introwidget.cpp index 54413872e..edacf6a73 100644 --- a/Telegram/SourceFiles/intro/introwidget.cpp +++ b/Telegram/SourceFiles/intro/introwidget.cpp @@ -28,6 +28,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/effects/slide_animation.h" #include "core/update_checker.h" #include "window/window_slide_animation.h" +#include "window/window_connecting_widget.h" #include "styles/style_boxes.h" #include "styles/style_intro.h" #include "styles/style_window.h" @@ -65,6 +66,7 @@ Widget::Widget(QWidget *parent) : RpWidget(parent) _settings->entity()->setClickedCallback([] { App::wnd()->showSettings(); }); getNearestDC(); + setupConnectingWidget(); appendStep(new StartWidget(this, getData())); fixOrder(); @@ -97,6 +99,12 @@ Widget::Widget(QWidget *parent) : RpWidget(parent) #endif // !TDESKTOP_DISABLE_AUTOUPDATE } +void Widget::setupConnectingWidget() { + _connecting = Window::ConnectingWidget::CreateDefaultWidget( + this, + rpl::single(true)); +} + void Widget::refreshLang() { _changeLanguage.destroy(); createLanguageLink(); @@ -212,6 +220,7 @@ void Widget::fixOrder() { if (_update) _update->raise(); _settings->raise(); _back->raise(); + _connecting->raise(); } void Widget::moveToStep(Step *step, Direction direction) { @@ -221,6 +230,7 @@ void Widget::moveToStep(Step *step, Direction direction) { if (_update) { _update->raise(); } + _connecting->raise(); historyMove(direction); } @@ -310,6 +320,7 @@ void Widget::showControls() { getStep()->show(); _next->show(); _next->setText([this] { return getStep()->nextButtonText(); }); + _connecting->setForceHidden(false); auto hasCover = getStep()->hasCover(); _settings->toggle(!hasCover, anim::type::instant); if (_update) _update->toggle(!hasCover, anim::type::instant); @@ -320,6 +331,7 @@ void Widget::showControls() { void Widget::hideControls() { getStep()->hide(); _next->hide(); + _connecting->setForceHidden(true); _settings->hide(anim::type::instant); if (_update) _update->hide(anim::type::instant); if (_changeLanguage) _changeLanguage->hide(anim::type::instant); diff --git a/Telegram/SourceFiles/intro/introwidget.h b/Telegram/SourceFiles/intro/introwidget.h index b1d8ba35c..0657ea546 100644 --- a/Telegram/SourceFiles/intro/introwidget.h +++ b/Telegram/SourceFiles/intro/introwidget.h @@ -21,6 +21,10 @@ template class FadeWrap; } // namespace Ui +namespace Window { +class ConnectingWidget; +} // namespace Window + namespace Intro { class Widget : public Ui::RpWidget, private MTP::Sender, private base::Subscriber { @@ -202,6 +206,7 @@ public: }; private: + void setupConnectingWidget(); void refreshLang(); void animationCallback(); void createLanguageLink(); @@ -249,6 +254,8 @@ private: object_ptr> _changeLanguage = { nullptr }; object_ptr> _resetAccount = { nullptr }; + base::unique_qptr _connecting; + mtpRequestId _resetRequest = 0; }; diff --git a/Telegram/SourceFiles/mainwidget.cpp b/Telegram/SourceFiles/mainwidget.cpp index 23e8149d8..6ed71e8d9 100644 --- a/Telegram/SourceFiles/mainwidget.cpp +++ b/Telegram/SourceFiles/mainwidget.cpp @@ -24,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/shadow.h" #include "window/section_memento.h" #include "window/section_widget.h" +#include "window/window_connecting_widget.h" #include "ui/widgets/dropdown_menu.h" #include "ui/focus_persister.h" #include "ui/resize_area.h" @@ -56,6 +57,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "boxes/mute_settings_box.h" #include "boxes/peer_list_controllers.h" #include "boxes/download_path_box.h" +#include "boxes/connection_box.h" #include "storage/localstorage.h" #include "shortcuts.h" #include "media/media_audio.h" @@ -214,6 +216,7 @@ MainWidget::MainWidget( _ptsWaiter.setRequesting(true); updateScrollColors(); + setupConnectingWidget(); connect(_dialogs, SIGNAL(cancelled()), this, SLOT(dialogsCancelled())); connect(this, SIGNAL(dialogsUpdated()), _dialogs, SLOT(onListScroll())); @@ -329,6 +332,13 @@ MainWidget::MainWidget( #endif // !TDESKTOP_DISABLE_AUTOUPDATE } +void MainWidget::setupConnectingWidget() { + using namespace rpl::mappers; + _connecting = Window::ConnectingWidget::CreateDefaultWidget( + this, + Window::AdaptiveIsOneColumn() | rpl::map(!_1)); +} + void MainWidget::checkCurrentFloatPlayer() { const auto state = Media::Player::instance()->current(AudioMsgId::Type::Voice); const auto fullId = state.contextId(); @@ -2567,6 +2577,7 @@ void MainWidget::orderWidgets() { if (_thirdColumnResizeArea) { _thirdColumnResizeArea->raise(); } + _connecting->raise(); _playerPlaylist->raise(); _playerPanel->raise(); for (auto &instance : _playerFloats) { diff --git a/Telegram/SourceFiles/mainwidget.h b/Telegram/SourceFiles/mainwidget.h index a7f4809da..31147d06e 100644 --- a/Telegram/SourceFiles/mainwidget.h +++ b/Telegram/SourceFiles/mainwidget.h @@ -54,6 +54,7 @@ class PlayerWrapWidget; class SectionMemento; class SectionWidget; class AbstractSectionWidget; +class ConnectingWidget; struct SectionSlideParams; struct SectionShow; enum class Column; @@ -426,6 +427,7 @@ private: -> std::unique_ptr; void userIsContactUpdated(not_null user); + void setupConnectingWidget(); void createPlayer(); void switchToPanelPlayer(); void switchToFixedPlayer(); @@ -561,6 +563,7 @@ private: object_ptr _mainSection = { nullptr }; object_ptr _thirdSection = { nullptr }; std::unique_ptr _thirdSectionFromStack; + base::unique_qptr _connecting; base::weak_ptr _currentCall; object_ptr> _callTopBar = { nullptr }; diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index 36de6a6cb..1d96b1e2a 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -63,50 +63,6 @@ void FeedLangTestingKey(int key) { } // namespace -ConnectingWidget::ConnectingWidget(QWidget *parent, const QString &text, const QString &reconnect) : TWidget(parent) -, _reconnect(this, QString()) { - set(text, reconnect); - connect(_reconnect, SIGNAL(clicked()), this, SLOT(onReconnect())); -} - -void ConnectingWidget::set(const QString &text, const QString &reconnect) { - _text = text; - _textWidth = st::linkFont->width(_text) + st::linkFont->spacew; - int32 _reconnectWidth = 0; - if (reconnect.isEmpty()) { - _reconnect->hide(); - } else { - _reconnect->setText(reconnect); - _reconnect->show(); - _reconnect->move(st::connectingPadding.left() + _textWidth, st::boxRoundShadow.extend.top() + st::connectingPadding.top()); - _reconnectWidth = _reconnect->width(); - } - resize(st::connectingPadding.left() + _textWidth + _reconnectWidth + st::connectingPadding.right() + st::boxRoundShadow.extend.right(), st::boxRoundShadow.extend.top() + st::connectingPadding.top() + st::normalFont->height + st::connectingPadding.bottom()); - update(); -} - -void ConnectingWidget::paintEvent(QPaintEvent *e) { - Painter p(this); - - auto sides = RectPart::Top | RectPart::Right; - Ui::Shadow::paint(p, QRect(0, st::boxRoundShadow.extend.top(), width() - st::boxRoundShadow.extend.right(), height() - st::boxRoundShadow.extend.top()), width(), st::boxRoundShadow, sides); - auto parts = RectPart::Top | RectPart::TopRight | RectPart::Center | RectPart::Right; - App::roundRect(p, QRect(-st::boxRadius, st::boxRoundShadow.extend.top(), width() - st::boxRoundShadow.extend.right() + st::boxRadius, height() - st::boxRoundShadow.extend.top() + st::boxRadius), st::boxBg, BoxCorners, nullptr, parts); - - p.setFont(st::normalFont); - p.setPen(st::windowSubTextFg); - p.drawText(st::connectingPadding.left(), st::boxRoundShadow.extend.top() + st::connectingPadding.top() + st::normalFont->ascent, _text); -} - -void ConnectingWidget::onReconnect() { - if (Global::UseProxy()) { - //Ui::show(Box()); - Ui::show(ProxiesBoxController::CreateOwningBox()); - } else { - MTP::restart(); - } -} - MainWindow::MainWindow() { auto logo = Messenger::Instance().logo(); icon16 = logo.scaledToWidth(16, Qt::SmoothTransformation); @@ -244,8 +200,6 @@ void MainWindow::setupIntro() { fixOrder(); - updateConnectingStatus(); - _delayedServiceMsgs.clear(); if (_serviceHistoryRequest) { MTP::cancel(_serviceHistoryRequest); @@ -332,8 +286,6 @@ void MainWindow::setupMain(const MTPUser *self) { _main->start(self); fixOrder(); - - updateConnectingStatus(); } void MainWindow::showSettings() { @@ -400,28 +352,6 @@ void MainWindow::ui_hideSettingsAndLayer(anim::type animated) { } } -void MainWindow::mtpStateChanged(int32 dc, int32 state) { - if (dc == MTP::maindc()) { - updateConnectingStatus(); - Global::RefConnectionTypeChanged().notify(); - } -} - -void MainWindow::updateConnectingStatus() { - const auto state = MTP::dcstate(); - const auto throughProxy = Global::UseProxy(); - if (state == MTP::ConnectingState || state == MTP::DisconnectedState || (state < 0 && state > -600)) { - if (_main || getms() > 5000 || _connecting) { - showConnecting(lang(throughProxy ? lng_connecting_to_proxy : lng_connecting), throughProxy ? lang(lng_connecting_settings) : QString()); - } - } else if (state < 0) { - showConnecting(lng_reconnecting(lt_count, ((-state) / 1000) + 1), lang(throughProxy ? lng_connecting_settings : lng_reconnecting_try_now)); - QTimer::singleShot((-state) % 1000, this, SLOT(updateConnectingStatus())); - } else { - hideConnecting(); - } -} - MainWidget *MainWindow::mainWidget() { return _main; } @@ -493,24 +423,6 @@ void MainWindow::ui_hideMediaPreview() { _mediaPreview->hidePreview(); } -void MainWindow::showConnecting(const QString &text, const QString &reconnect) { - if (_connecting) { - _connecting->set(text, reconnect); - _connecting->show(); - } else { - _connecting.create(bodyWidget(), text, reconnect); - _connecting->show(); - updateControlsGeometry(); - fixOrder(); - } -} - -void MainWindow::hideConnecting() { - if (_connecting) { - _connecting->hide(); - } -} - void MainWindow::themeUpdated(const Window::Theme::BackgroundUpdate &data) { using Type = Window::Theme::BackgroundUpdate::Type; @@ -758,7 +670,6 @@ bool MainWindow::takeThirdSectionFromLayer() { void MainWindow::fixOrder() { if (_layerBg) _layerBg->raise(); if (_mediaPreview) _mediaPreview->raise(); - if (_connecting) _connecting->raise(); if (_testingThemeWarning) _testingThemeWarning->raise(); } @@ -850,7 +761,6 @@ void MainWindow::updateControlsGeometry() { if (_intro) _intro->setGeometry(body); if (_layerBg) _layerBg->setGeometry(body); if (_mediaPreview) _mediaPreview->setGeometry(body); - if (_connecting) _connecting->moveToLeft(0, body.height() - _connecting->height()); if (_testingThemeWarning) _testingThemeWarning->setGeometry(body); if (_main) _main->checkMainSectionToLayer(); diff --git a/Telegram/SourceFiles/mainwindow.h b/Telegram/SourceFiles/mainwindow.h index 8f28a8f62..880c237ff 100644 --- a/Telegram/SourceFiles/mainwindow.h +++ b/Telegram/SourceFiles/mainwindow.h @@ -38,26 +38,6 @@ namespace Ui { class LinkButton; } // namespace Ui -class ConnectingWidget : public TWidget { - Q_OBJECT - -public: - ConnectingWidget(QWidget *parent, const QString &text, const QString &reconnect); - void set(const QString &text, const QString &reconnect); - -protected: - void paintEvent(QPaintEvent *e) override; - -public slots: - void onReconnect(); - -private: - QString _text; - int _textWidth = 0; - object_ptr _reconnect; - -}; - class MediaPreviewWidget; class MainWindow : public Platform::MainWindow { @@ -77,8 +57,6 @@ public: void sendServiceHistoryRequest(); void showDelayedServiceMsgs(); - void mtpStateChanged(int32 dc, int32 state); - MainWidget *chatsWidget() { return mainWidget(); } @@ -153,7 +131,6 @@ protected: public slots: void showSettings(); void setInnerFocus(); - void updateConnectingStatus(); void quitFromTray(); void showFromTray(QSystemTrayIcon::ActivationReason reason = QSystemTrayIcon::Unknown); @@ -174,9 +151,6 @@ signals: void checkNewAuthorization(); private: - void showConnecting(const QString &text, const QString &reconnect = QString()); - void hideConnecting(); - [[nodiscard]] bool skipTrayClick() const; void ensureLayerCreated(); @@ -206,7 +180,6 @@ private: object_ptr _layerBg = { nullptr }; object_ptr _mediaPreview = { nullptr }; - object_ptr _connecting = { nullptr }; object_ptr _testingThemeWarning = { nullptr }; Local::ClearManager *_clearManager = nullptr; diff --git a/Telegram/SourceFiles/messenger.cpp b/Telegram/SourceFiles/messenger.cpp index 738819d44..de28b7b24 100644 --- a/Telegram/SourceFiles/messenger.cpp +++ b/Telegram/SourceFiles/messenger.cpp @@ -397,9 +397,9 @@ void Messenger::startMtp() { _mtproto->setUserPhone(cLoggedPhoneNumber()); _private->mtpConfig.mainDcId = _mtproto->mainDcId(); - _mtproto->setStateChangedHandler([](MTP::ShiftedDcId shiftedDcId, int32 state) { - if (App::wnd()) { - App::wnd()->mtpStateChanged(shiftedDcId, state); + _mtproto->setStateChangedHandler([](MTP::ShiftedDcId dc, int32 state) { + if (dc == MTP::maindc()) { + Global::RefConnectionTypeChanged().notify(); } }); _mtproto->setSessionResetHandler([](MTP::ShiftedDcId shiftedDcId) { diff --git a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp index 5e2531e3f..3e50cc3ca 100644 --- a/Telegram/SourceFiles/settings/settings_advanced_widget.cpp +++ b/Telegram/SourceFiles/settings/settings_advanced_widget.cpp @@ -111,7 +111,6 @@ void AdvancedWidget::connectionTypeUpdated() { } void AdvancedWidget::onConnectionType() { - //Ui::show(Box()); Ui::show(ProxiesBoxController::CreateOwningBox()); } #endif // !TDESKTOP_DISABLE_NETWORK_PROXY diff --git a/Telegram/SourceFiles/ui/effects/radial_animation.cpp b/Telegram/SourceFiles/ui/effects/radial_animation.cpp index d95eee195..559860214 100644 --- a/Telegram/SourceFiles/ui/effects/radial_animation.cpp +++ b/Telegram/SourceFiles/ui/effects/radial_animation.cpp @@ -125,6 +125,14 @@ void InfiniteRadialAnimation::draw( Painter &p, QPoint position, int outerWidth) { + draw(p, position, _st.size, outerWidth); +} + +void InfiniteRadialAnimation::draw( + Painter &p, + QPoint position, + QSize size, + int outerWidth) { const auto state = computeState(); auto o = p.opacity(); @@ -142,8 +150,8 @@ void InfiniteRadialAnimation::draw( rtlrect( position.x(), position.y(), - _st.size.width(), - _st.size.height(), + size.width(), + size.height(), outerWidth), state.arcFrom, state.arcLength); diff --git a/Telegram/SourceFiles/ui/effects/radial_animation.h b/Telegram/SourceFiles/ui/effects/radial_animation.h index d36e9aa42..bc28c5a7f 100644 --- a/Telegram/SourceFiles/ui/effects/radial_animation.h +++ b/Telegram/SourceFiles/ui/effects/radial_animation.h @@ -73,6 +73,11 @@ public: Painter &p, QPoint position, int outerWidth); + void draw( + Painter &p, + QPoint position, + QSize size, + int outerWidth); State computeState(); diff --git a/Telegram/SourceFiles/ui/rp_widget.h b/Telegram/SourceFiles/ui/rp_widget.h index 79083e529..87fae019b 100644 --- a/Telegram/SourceFiles/ui/rp_widget.h +++ b/Telegram/SourceFiles/ui/rp_widget.h @@ -135,7 +135,7 @@ public: void setVisible(bool visible) final override { auto wasVisible = !this->isHidden(); - Parent::setVisible(visible); + setVisibleHook(visible); visibilityChangedHook(wasVisible, !this->isHidden()); } @@ -151,6 +151,9 @@ protected: bool eventHook(QEvent *event) override { return Parent::event(event); } + virtual void setVisibleHook(bool visible) { + Parent::setVisible(visible); + } private: void callSetVisible(bool visible) override { diff --git a/Telegram/SourceFiles/ui/widgets/buttons.cpp b/Telegram/SourceFiles/ui/widgets/buttons.cpp index 36b63a426..be9cc9c76 100644 --- a/Telegram/SourceFiles/ui/widgets/buttons.cpp +++ b/Telegram/SourceFiles/ui/widgets/buttons.cpp @@ -14,35 +14,45 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL namespace Ui { -LinkButton::LinkButton(QWidget *parent, const QString &text, const style::LinkButton &st) : AbstractButton(parent) +LinkButton::LinkButton( + QWidget *parent, + const QString &text, + const style::LinkButton &st) +: AbstractButton(parent) +, _st(st) , _text(text) -, _textWidth(st.font->width(_text)) -, _st(st) { - resize(_textWidth, _st.font->height); +, _textWidth(st.font->width(_text)) { + resize( + naturalWidth(), + _st.padding.top() + _st.font->height + _st.padding.bottom()); setCursor(style::cur_pointer); } int LinkButton::naturalWidth() const { - return _textWidth; + return _st.padding.left() + _textWidth + _st.padding.right(); } void LinkButton::paintEvent(QPaintEvent *e) { Painter p(this); + auto &font = (isOver() ? _st.overFont : _st.font); auto &pen = (isOver() ? _st.overColor : _st.color); p.setFont(font); p.setPen(pen); - if (_textWidth > width()) { - p.drawText(0, font->ascent, font->elided(_text, width())); + const auto left = _st.padding.left(); + const auto top = _st.padding.top() + font->ascent; + if (width() > naturalWidth()) { + const auto available = width() - left - _st.padding.right(); + p.drawText(left, top, font->elided(_text, available)); } else { - p.drawText(0, font->ascent, _text); + p.drawText(left, top, _text); } } void LinkButton::setText(const QString &text) { _text = text; _textWidth = _st.font->width(_text); - resize(_textWidth, _st.font->height); + resize(naturalWidth(), _st.font->height); update(); } diff --git a/Telegram/SourceFiles/ui/widgets/buttons.h b/Telegram/SourceFiles/ui/widgets/buttons.h index f8c82ae89..a7fa51c7b 100644 --- a/Telegram/SourceFiles/ui/widgets/buttons.h +++ b/Telegram/SourceFiles/ui/widgets/buttons.h @@ -31,9 +31,9 @@ protected: void onStateChanged(State was, StateChangeSource source) override; private: + const style::LinkButton &_st; QString _text; int _textWidth = 0; - const style::LinkButton &_st; }; diff --git a/Telegram/SourceFiles/ui/widgets/widgets.style b/Telegram/SourceFiles/ui/widgets/widgets.style index 48f2bd794..272d6ebff 100644 --- a/Telegram/SourceFiles/ui/widgets/widgets.style +++ b/Telegram/SourceFiles/ui/widgets/widgets.style @@ -29,6 +29,7 @@ LinkButton { overColor: color; font: font; overFont: font; + padding: margins; } RippleAnimation { diff --git a/Telegram/SourceFiles/window/window.style b/Telegram/SourceFiles/window/window.style index 83dd1a64c..0cbacc108 100644 --- a/Telegram/SourceFiles/window/window.style +++ b/Telegram/SourceFiles/window/window.style @@ -247,6 +247,27 @@ windowEmojiSuggestionsPopup: PopupMenu(defaultPopupMenu) { } } +connectingLeftShadow: icon {{ "connecting_left_shadow", windowShadowFg }}; +connectingLeft: icon {{ "connecting_left", windowBg }}; +connectingRightShadow: icon {{ "connecting_right_shadow", windowShadowFg }}; +connectingRight: icon {{ "connecting_right", windowBg }}; +connectingBodyShadow: icon {{ "connecting_body_shadow", windowShadowFg }}; +connectingBody: icon {{ "connecting_body", windowBg }}; +connectingMargin: margins(2px, 2px, 2px, 2px); +connectingTextPadding: margins(18px, 11px, 18px, 0px); +connectingRadialSkip: 6px; +connectingRadial: InfiniteRadialAnimation(defaultInfiniteRadialAnimation) { + color: menuIconFg; + thickness: 2px; + size: size(20px, 20px); +} +connectingRetryLink: LinkButton(defaultLinkButton) { + padding: margins(6px, 11px, 6px, 0px); +} +connectingProxyOff: icon {{ "proxy_off", menuIconFg }}; +connectingProxyOn: icon {{ "proxy_on", windowBgActive }}; +connectingDuration: 150; + // Mac specific macAccessoryWidth: 450.; diff --git a/Telegram/SourceFiles/window/window_connecting_widget.cpp b/Telegram/SourceFiles/window/window_connecting_widget.cpp new file mode 100644 index 000000000..9b61e9624 --- /dev/null +++ b/Telegram/SourceFiles/window/window_connecting_widget.cpp @@ -0,0 +1,523 @@ +/* +This file is part of Telegram Desktop, +the official desktop application for the Telegram messaging service. + +For license and copyright information please follow this link: +https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL +*/ +#include "window/window_connecting_widget.h" + +#include "ui/widgets/buttons.h" +#include "ui/effects/radial_animation.h" +#include "boxes/connection_box.h" +#include "lang/lang_keys.h" +#include "styles/style_window.h" + +namespace Window { +namespace { + +constexpr auto kIgnoreStartConnectingFor = TimeMs(3000); +constexpr auto kConnectingStateDelay = TimeMs(1000); +constexpr auto kRefreshTimeout = TimeMs(200); +constexpr auto kMinimalWaitingStateDuration = TimeMs(4000); + +class Progress : public Ui::RpWidget { +public: + Progress(QWidget *parent); + +protected: + void paintEvent(QPaintEvent *e) override; + +private: + void step(TimeMs ms, bool timer); + + Ui::InfiniteRadialAnimation _animation; + +}; + +Progress::Progress(QWidget *parent) +: RpWidget(parent) +, _animation(animation(this, &Progress::step), st::connectingRadial) { + setAttribute(Qt::WA_OpaquePaintEvent); + setAttribute(Qt::WA_TransparentForMouseEvents); + resize(st::connectingRadial.size); + _animation.start(); +} + +void Progress::paintEvent(QPaintEvent *e) { + Painter p(this); + + p.fillRect(e->rect(), st::windowBg); + const auto &st = st::connectingRadial; + const auto shift = st.thickness - (st.thickness / 2); + _animation.draw( + p, + { shift, shift }, + QSize(st.size.width() - 2 * shift, st.size.height() - 2 * shift), + width()); +} + +void Progress::step(TimeMs ms, bool timer) { + if (timer) { + update(); + } +} + +} // namespace + +class ConnectingWidget::ProxyIcon : public Ui::RpWidget { +public: + ProxyIcon(QWidget *parent); + + void setToggled(bool toggled); + void setOpacity(float64 opacity); + +protected: + void paintEvent(QPaintEvent *e) override; + +private: + float64 _opacity = 1.; + QPixmap _cacheOn; + QPixmap _cacheOff; + bool _toggled = true; + +}; + +ConnectingWidget::ProxyIcon::ProxyIcon(QWidget *parent) : RpWidget(parent) { + resize( + std::max( + st::connectingRadial.size.width(), + st::connectingProxyOn.width()), + std::max( + st::connectingRadial.size.height(), + st::connectingProxyOn.height())); + + const auto prepareCache = [&](const style::icon &icon) { + auto image = QImage( + size() * cIntRetinaFactor(), + QImage::Format_ARGB32_Premultiplied); + image.fill(st::windowBg->c); + { + Painter p(&image); + icon.paint( + p, + (width() - icon.width()) / 2, + (height() - icon.height()) / 2, + width()); + } + return App::pixmapFromImageInPlace(std::move(image)); + }; + _cacheOn = prepareCache(st::connectingProxyOn); + _cacheOff = prepareCache(st::connectingProxyOff); +} + +void ConnectingWidget::ProxyIcon::setToggled(bool toggled) { + if (_toggled != toggled) { + _toggled = toggled; + update(); + } +} + +void ConnectingWidget::ProxyIcon::setOpacity(float64 opacity) { + _opacity = opacity; + if (_opacity == 0.) { + hide(); + } else if (isHidden()) { + show(); + } + update(); +} + +void ConnectingWidget::ProxyIcon::paintEvent(QPaintEvent *e) { + Painter p(this); + p.setOpacity(_opacity); + p.drawPixmap(0, 0, _toggled ? _cacheOn : _cacheOff); +} + +bool ConnectingWidget::State::operator==(const State &other) const { + return (type == other.type) + && (useProxy == other.useProxy) + && (underCursor == other.underCursor) + && (waitTillRetry == other.waitTillRetry); +} + +ConnectingWidget::ConnectingWidget(QWidget *parent) +: AbstractButton(parent) +, _refreshTimer([=] { refreshState(); }) +, _currentLayout(computeLayout(_state)) { + _proxyIcon = Ui::CreateChild(this); + _progress = Ui::CreateChild(this); + + addClickHandler([=] { + Ui::show(ProxiesBoxController::CreateOwningBox()); + }); + + subscribe(Global::RefConnectionTypeChanged(), [=] { + refreshState(); + }); + refreshState(); +} + +rpl::producer ConnectingWidget::visibility() const { + return _visibilityValues.events_starting_with(currentVisibility()); +} + +void ConnectingWidget::finishAnimating() { + if (_contentWidth.animating()) { + _contentWidth.finish(); + updateWidth(); + } + if (_visibility.animating()) { + _visibility.finish(); + updateVisibility(); + } +} + +void ConnectingWidget::setForceHidden(bool hidden) { + if (_forceHidden == hidden) { + return; + } + if (hidden) { + const auto real = isHidden(); + if (!real) { + hide(); + } + _realHidden = real; + } + _forceHidden = hidden; + if (!hidden && isHidden() != _realHidden) { + setVisible(!_realHidden); + } +} + +void ConnectingWidget::setVisibleHook(bool visible) { + if (_forceHidden) { + _realHidden = !visible; + return; + } + QWidget::setVisible(visible); +} + +base::unique_qptr ConnectingWidget::CreateDefaultWidget( + Ui::RpWidget *parent, + rpl::producer shown) { + auto result = base::make_unique_q(parent); + const auto weak = result.get(); + rpl::combine( + result->visibility(), + parent->heightValue(), + std::move(shown) + ) | rpl::start_with_next([=](float64 visible, int height, bool shown) { + const auto hidden = (visible == 0.) || !shown; + if (weak->isHidden() != hidden) { + weak->setVisible(!hidden); + } + const auto size = weak->size(); + weak->moveToLeft(0, anim::interpolate( + height - st::connectingMargin.top(), + height - weak->height(), + visible)); + }, weak->lifetime()); + result->finishAnimating(); + return result; +} + +void ConnectingWidget::onStateChanged( + AbstractButton::State was, + StateChangeSource source) { + crl::on_main(this, [=] { refreshState(); }); +} + +void ConnectingWidget::paintEvent(QPaintEvent *e) { + Painter p(this); + PainterHighQualityEnabler hq(p); + + p.setPen(Qt::NoPen); + p.setBrush(st::windowBg); + const auto inner = innerRect(); + const auto content = contentRect(); + const auto text = textRect(); + const auto left = inner.topLeft(); + const auto right = content.topLeft() + QPoint(content.width(), 0); + st::connectingLeftShadow.paint(p, left, width()); + st::connectingLeft.paint(p, left, width()); + st::connectingRightShadow.paint(p, right, width()); + st::connectingRight.paint(p, right, width()); + st::connectingBodyShadow.fill(p, content); + st::connectingBody.fill(p, content); + + const auto available = text.width(); + if (available > 0 && !_currentLayout.text.isEmpty()) { + p.setFont(st::normalFont); + p.setPen(st::windowSubTextFg); + if (available >= _currentLayout.textWidth) { + p.drawTextLeft( + text.x(), + text.y(), + width(), + _currentLayout.text, + _currentLayout.textWidth); + } else { + p.drawTextLeft( + text.x(), + text.y(), + width(), + st::normalFont->elided(_currentLayout.text, available)); + } + } +} + +QRect ConnectingWidget::innerRect() const { + return rect().marginsRemoved( + st::connectingMargin + ); +} + +QRect ConnectingWidget::contentRect() const { + return innerRect().marginsRemoved(style::margins( + st::connectingLeft.width(), + 0, + st::connectingRight.width(), + 0)); +} + +QRect ConnectingWidget::textRect() const { + return contentRect().marginsRemoved( + st::connectingTextPadding + ); +} + +void ConnectingWidget::resizeEvent(QResizeEvent *e) { + { + const auto xShift = (height() - _progress->width()) / 2; + const auto yShift = (height() - _progress->height()) / 2; + _progress->moveToLeft(xShift, yShift); + } + { + const auto xShift = (height() - _proxyIcon->width()) / 2; + const auto yShift = (height() - _proxyIcon->height()) / 2; + _proxyIcon->moveToRight(xShift, yShift); + } + updateRetryGeometry(); +} + +void ConnectingWidget::updateRetryGeometry() { + if (!_retry) { + return; + } + const auto text = textRect(); + const auto available = text.width() - _currentLayout.textWidth; + if (available <= 0) { + _retry->hide(); + } else { + _retry->show(); + _retry->resize( + std::min(available, _retry->naturalWidth()), + innerRect().height()); + _retry->moveToLeft( + text.x() + text.width() - _retry->width(), + st::connectingMargin.top()); + } +} + +void ConnectingWidget::refreshState() { + const auto state = [&]() -> State { + const auto under = isOver(); + const auto mtp = MTP::dcstate(); + const auto throughProxy = Global::UseProxy(); + if (mtp == MTP::ConnectingState + || mtp == MTP::DisconnectedState + || (mtp < 0 && mtp > -600)) { + return { State::Type::Connecting, throughProxy, under }; + } else if (mtp < 0 + && mtp >= -kMinimalWaitingStateDuration + && _state.type != State::Type::Waiting) { + return { State::Type::Connecting, throughProxy, under }; + } else if (mtp < 0) { + const auto seconds = ((-mtp) / 1000) + 1; + return { State::Type::Waiting, throughProxy, under, seconds }; + } + return { State::Type::Connected, throughProxy, under }; + }(); + if (state.waitTillRetry > 0) { + _refreshTimer.callOnce(kRefreshTimeout); + } + if (state == _state) { + return; + } else if (state.type == State::Type::Connecting + && _state.type == State::Type::Connected) { + const auto now = getms(); + if (!_connectingStartedAt) { + _connectingStartedAt = now; + _refreshTimer.callOnce(kConnectingStateDelay); + return; + } + const auto applyConnectingAt = std::max( + _connectingStartedAt + kConnectingStateDelay, + kIgnoreStartConnectingFor); + if (now < applyConnectingAt) { + _refreshTimer.callOnce(applyConnectingAt - now); + return; + } + } + applyState(state); +} + +void ConnectingWidget::applyState(const State &state) { + const auto newLayout = computeLayout(state); + const auto guard = gsl::finally([&] { + updateWidth(); + update(); + }); + + _state = state; + if (_currentLayout.visible != newLayout.visible) { + changeVisibilityWithLayout(newLayout); + return; + } + if (_currentLayout.contentWidth != newLayout.contentWidth) { + if (!_currentLayout.contentWidth + || !newLayout.contentWidth + || _contentWidth.animating()) { + _contentWidth.start( + [=] { updateWidth(); }, + _currentLayout.contentWidth, + newLayout.contentWidth, + st::connectingDuration); + } + } + const auto saved = _currentLayout; + setLayout(newLayout); + if (_currentLayout.text.isEmpty() + && !saved.text.isEmpty() + && _contentWidth.animating()) { + _currentLayout.text = saved.text; + _currentLayout.textWidth = saved.textWidth; + } + refreshRetryLink(_currentLayout.hasRetry); +} + +void ConnectingWidget::changeVisibilityWithLayout(const Layout &layout) { + Expects(_currentLayout.visible != layout.visible); + + const auto changeLayout = !_currentLayout.visible; + _visibility.start( + [=] { updateVisibility(); }, + layout.visible ? 0. : 1., + layout.visible ? 1. : 0., + st::connectingDuration); + if (_contentWidth.animating()) { + _contentWidth.start( + [=] { updateWidth(); }, + _currentLayout.contentWidth, + (changeLayout ? layout : _currentLayout).contentWidth, + st::connectingDuration); + } + if (changeLayout) { + setLayout(layout); + } else { + _currentLayout.visible = layout.visible; + } +} + +void ConnectingWidget::setLayout(const Layout &layout) { + _currentLayout = layout; + _proxyIcon->setToggled(_currentLayout.proxyEnabled); + _progress->setVisible(_contentWidth.animating() + || _currentLayout.progressShown); +} + +void ConnectingWidget::refreshRetryLink(bool hasRetry) { + if (hasRetry && !_retry) { + _retry = base::make_unique_q( + this, + lang(lng_reconnecting_try_now), + st::connectingRetryLink); + _retry->addClickHandler([=] { + MTP::restart(); + }); + updateRetryGeometry(); + } else if (!hasRetry) { + _retry = nullptr; + } +} + +void ConnectingWidget::updateVisibility() { + const auto value = currentVisibility(); + if (value == 0. && _contentWidth.animating()) { + _contentWidth.finish(); + updateWidth(); + } + _visibilityValues.fire_copy(value); +} + +float64 ConnectingWidget::currentVisibility() const { + return _visibility.current(_currentLayout.visible ? 1. : 0.); +} + +auto ConnectingWidget::computeLayout(const State &state) const -> Layout { + auto result = Layout(); + result.proxyEnabled = state.useProxy; + result.progressShown = (state.type != State::Type::Connected); + result.visible = state.useProxy + || state.type == State::Type::Connecting + || state.type == State::Type::Waiting; + switch (state.type) { + case State::Type::Connecting: + result.text = state.underCursor ? lang(lng_connecting) : QString(); + break; + + case State::Type::Waiting: + Assert(state.waitTillRetry > 0); + result.text = lng_reconnecting(lt_count, state.waitTillRetry); + break; + } + result.textWidth = st::normalFont->width(result.text); + const auto maxTextWidth = (state.type == State::Type::Waiting) + ? st::normalFont->width(lng_reconnecting(lt_count, 88)) + : result.textWidth; + result.contentWidth = (result.textWidth > 0) + ? (st::connectingTextPadding.left() + + result.textWidth + + st::connectingTextPadding.right()) + : 0; + if (state.type == State::Type::Waiting) { + result.contentWidth += st::connectingRetryLink.padding.left() + + st::connectingRetryLink.font->width( + lang(lng_reconnecting_try_now)) + + st::connectingRetryLink.padding.right(); + } + result.hasRetry = (state.type == State::Type::Waiting); + return result; +} + +void ConnectingWidget::updateWidth() { + const auto current = _contentWidth.current(_currentLayout.contentWidth); + const auto height = st::connectingLeft.height(); + const auto desired = QRect(0, 0, current, height).marginsAdded( + style::margins( + st::connectingLeft.width(), + 0, + st::connectingRight.width(), + 0) + ).marginsAdded( + st::connectingMargin + ); + resize(desired.size()); + if (!_contentWidth.animating()) { + _progress->setVisible(_currentLayout.progressShown); + } + update(); +} + +rpl::producer AdaptiveIsOneColumn() { + return rpl::single( + Adaptive::OneColumn() + ) | rpl::then(base::ObservableViewer( + Adaptive::Changed() + ) | rpl::map([] { + return Adaptive::OneColumn(); + })); +} + +} // namespace Window diff --git a/Telegram/SourceFiles/window/window_connecting_widget.h b/Telegram/SourceFiles/window/window_connecting_widget.h new file mode 100644 index 000000000..ec9318540 --- /dev/null +++ b/Telegram/SourceFiles/window/window_connecting_widget.h @@ -0,0 +1,100 @@ +/* +This file is part of Telegram Desktop, +the official desktop application for the Telegram messaging service. + +For license and copyright information please follow this link: +https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL +*/ +#pragma once + +#include "ui/abstract_button.h" +#include "base/timer.h" + +namespace Ui { +class LinkButton; +} // namespace Ui + +namespace Window { + +class ConnectingWidget + : public Ui::AbstractButton + , private base::Subscriber { +public: + ConnectingWidget(QWidget *parent); + + rpl::producer visibility() const; + + void finishAnimating(); + void setForceHidden(bool hidden); + void setVisibleHook(bool visible) override; + + static base::unique_qptr CreateDefaultWidget( + Ui::RpWidget *parent, + rpl::producer shown); + +protected: + void resizeEvent(QResizeEvent *e) override; + void paintEvent(QPaintEvent *e) override; + + void onStateChanged(State was, StateChangeSource source) override; + +private: + class ProxyIcon; + struct State { + enum class Type { + Connected, + Connecting, + Waiting, + }; + Type type = Type::Connected; + bool useProxy = false; + bool underCursor = false; + int waitTillRetry = 0; + + bool operator==(const State &other) const; + + }; + struct Layout { + bool visible = false; + bool hasRetry = false; + bool proxyEnabled = false; + bool progressShown = false; + int contentWidth = 0; + QString text; + int textWidth = 0; + + }; + void updateRetryGeometry(); + void updateWidth(); + void updateVisibility(); + void refreshState(); + void applyState(const State &state); + void changeVisibilityWithLayout(const Layout &layout); + void refreshRetryLink(bool hasRetry); + Layout computeLayout(const State &state) const; + void setLayout(const Layout &layout); + float64 currentVisibility() const; + + QRect innerRect() const; + QRect contentRect() const; + QRect textRect() const; + + base::Timer _refreshTimer; + State _state; + Layout _currentLayout; + TimeMs _connectingStartedAt = 0; + Animation _contentWidth; + Animation _visibility; + base::unique_qptr _retry; + QPointer _progress; + QPointer _proxyIcon; + bool _forceHidden = false; + bool _realHidden = false; + + rpl::event_stream _visibilityValues; + +}; + +rpl::producer AdaptiveIsOneColumn(); + +} // namespace Window diff --git a/Telegram/gyp/telegram_sources.txt b/Telegram/gyp/telegram_sources.txt index 710ed8dac..c14989caa 100644 --- a/Telegram/gyp/telegram_sources.txt +++ b/Telegram/gyp/telegram_sources.txt @@ -701,6 +701,8 @@ <(src_loc)/window/section_memento.h <(src_loc)/window/section_widget.cpp <(src_loc)/window/section_widget.h +<(src_loc)/window/window_connecting_widget.cpp +<(src_loc)/window/window_connecting_widget.h <(src_loc)/window/window_controller.cpp <(src_loc)/window/window_controller.h <(src_loc)/window/window_main_menu.cpp