From 1dfb8cbde2f1b9f6033db5be0b9d2e9e28f427cf Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 19 May 2016 20:18:23 +0300 Subject: [PATCH] New history-to-down button. --- Telegram/Resources/basic.style | 14 ---- .../Resources/icons/history_down_arrow.png | Bin 0 -> 321 bytes .../Resources/icons/history_down_arrow@2x.png | Bin 0 -> 637 bytes .../Resources/icons/history_down_circle.png | Bin 0 -> 628 bytes .../icons/history_down_circle@2x.png | Bin 0 -> 1561 bytes .../Resources/icons/history_down_shadow.png | Bin 0 -> 1458 bytes .../icons/history_down_shadow@2x.png | Bin 0 -> 3645 bytes Telegram/SourceFiles/history/history.style | 30 ++++++++ Telegram/SourceFiles/historywidget.cpp | 28 ++++---- Telegram/SourceFiles/historywidget.h | 6 +- .../ui/buttons/history_down_button.cpp | 68 ++++++++++++++++++ .../ui/buttons/history_down_button.h | 47 ++++++++++++ .../ui/buttons/peer_avatar_button.h | 5 +- Telegram/Telegram.vcxproj | 30 ++++++++ Telegram/Telegram.vcxproj.filters | 24 +++++++ 15 files changed, 223 insertions(+), 29 deletions(-) create mode 100644 Telegram/Resources/icons/history_down_arrow.png create mode 100644 Telegram/Resources/icons/history_down_arrow@2x.png create mode 100644 Telegram/Resources/icons/history_down_circle.png create mode 100644 Telegram/Resources/icons/history_down_circle@2x.png create mode 100644 Telegram/Resources/icons/history_down_shadow.png create mode 100644 Telegram/Resources/icons/history_down_shadow@2x.png create mode 100644 Telegram/SourceFiles/history/history.style create mode 100644 Telegram/SourceFiles/ui/buttons/history_down_button.cpp create mode 100644 Telegram/SourceFiles/ui/buttons/history_down_button.h 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 0000000000000000000000000000000000000000..d47721fa1091490a4469980c2e7e7d522b0f8fea GIT binary patch literal 321 zcmV-H0lxl;P)+I44eWHxkY6ursS! zA|fcIptVL-RUo2&y{f99wT4paUR#z053K8ox~~5mQr9)sbuIsvWx)@fAf+T@3^B&& z6BuJ;j3FuIrH6T*aU4fc*tQK#(_EZ1O@nRQ3hy`$%=7%{-$~OnA?I93)>?4R%Mi{v zthJ?|bH+4HXQ5xkaU79SD&&3N(Y7txw#B~hrJhp4IF7H5pY0FBfEeSG{qx!}MhwI7 zE`)0;ecvO5fLDYN(D(hPG~Y+ubsfC-Wr+74UDtg(i_iBWgn)An&N&DnzTVaiWED&n T{)L5@00000NkvXXu0mjfMR|-_ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..085877e03a1fce205358484c0e3314d1556cc21c GIT binary patch literal 637 zcmV-@0)qXCP)ZfiIkVm_aP<2d}k_Nn4H4vWPC!{PAW`o9NR zmJtL206^0;WV6|i!(_8rXqpB92!a5zEZ+xG6a`Tf;a1D#61iONV=%c~4$I~8+l(lR zpeV|Bpy_l9mNuIW^7;JRF!_8Q+wGP)XF8pNi13?Y)MzwF*L5ls3URGW6$%B?b)D+< zdZK>jmEFoP43tWxr%$F-D#0)ertjS=yVPhjx_;F6WLXxf)oNmxYPAZ>vY38B5MVqW zvr|TYWAFPu)5LKcG@H#>m}avH$8nfGzVFA!{!;yZAE(oaX?8dq&~CSxFzt35hr@xn z|8zQ`-|w^b-#6`aIyfGW4^4Z$-j98~Uhm<{e0_bP+wDF&UG}lJS}nM)%QW{q4}-zr z+CLZ!;CUXi-*sKITCKS2e*7)eYBkul%^Y$*pCL&SBuT>gd}j99wvAe?mLv@EX(^Y> zFin#=EDS@0VaQxJO%s($C22a7MYvcjV!z)rhqAQa?@=rk6aOj_0}&BKQN(VyOANEy z?I4QcGceBq5fKDIz-qOMg;}rH5Cq{_nCF3r2t3b2*L5b0uIu1={uP+lfQSg0Oa`i| z{(w*h=^!1nNS#p@7U2F XA!8$Zw+K@=00000NkvXXu0mjfJC`Ot literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/history_down_circle.png b/Telegram/Resources/icons/history_down_circle.png new file mode 100644 index 0000000000000000000000000000000000000000..f94e8dd7b61b5cdee657cf703e1a7a19af1d6152 GIT binary patch literal 628 zcmV-)0*n2LP)5WeqYyBiEYg%Y5iTUDv5?+qrS~vTd8{ zy8c?|a5#J!@b8Ah;r~M=NusOO>TSrh)oMj0NqP>dX&Mc~@a@R7Fbt`tY5Ab7R*NP{ z@?*%fBuQwi)p`sn2m+0w=*N+1aU4@Y5dID2IF5Rr#|)X~c^>6B?ml!d7_c_}X)qYv zhRU+c+IE#J%h%A^Y{uGk)oeEV4pmi^wdroEs!{-y06@Rr$ETLsxKgP^gCIbyR%1-M z-G09Z&+{PNZueu608p#d(ChU;Ow(j-$;>oOkY=;V+L2ka*#r?qk+mZ;Q4~RVo@edI zjOTffYPHJRky*7`1xb>Gwd0{k6h*8JnMF|q5{4mbM`pX-4rIICvUX&)-EKi#*JbU< z%ynH5$8lIYGIJcKKtCm?(+T78n6>9_lgR|<^BF)vew=|KZAI{*n>$5O3cOuLkq#hG zlp~#V3UNr5P9csR(<#J3?$-~@vaGiuEz7#~;pB&=^Xkin>2&(~%Z9J>itC$pyPa!I z0F+C$c`KL8=yWO-EIfp_p#Y*uv{)NpUrKo2uXTBp-YL O0000 zT~E_s6vzKI~&2xKxYy-_a|KY=fdFW_zn-0}&yVqXBgaM6&EC?nGg zm5WJWiIk8TFT?Uta>h0}qU7?{+h-PPJN!N8Yk%!TBo#OF0g+ig$5!%twL9tk@sYD(|*L8}; zV${*m(Y!+2+S+Jzbd++r9JjBE$>nl1Iyy>iZEejZRF-90T3X`vQ!`6TOVriX)f_^H zhK4Ac&2l@bn`|~qLqkJ+LM2I}$;nA>4~7$sMoE&S#tL;f95gdC!=1Zn%*@P?!{KO* zP?yU^^YioEIh)S>{5-i_E^~#t-ELA8g*(@Vp(si%XIYiKvAw;W78e(}b8I+^i;L9W z-fpZ=Ns{RK^XJ^Tu`xS4Tg`#$|8KJ5(Y#tFCnt>&8V-lKb7>lehllGE+TGnvnx=8* z(KKk9M%~@rwF#9ZiBhQ)cMeTQDwX>^{-(Y-+$`w2Uhc~O z!3FVnoIBQ*VQy~j-+gE>7{v1OG6X>|ah^=KQ6bkVB{n**r0kCfmy?_6{EwcukPA48bcu@MeB=p|B zdn^H2fxCC_mR<`0$nW>#>({S#|5+nMgbNogU~6mZ&mKBBIB3hP13?gQ=gu7ff4}m# zZ{KDO$O;r43IOQaw{P(Ie7q60II61R+_`fQE?v4rYin!V@mK;`mLc}_^>N2x8T$JA zAole1aK~X8dU|>w%CgKIhh>mu8KP0++iif(&Q6GD&z|Lu!!r1MK8Rkgmpcy2;PH4M zIvft}I4pzH>4ZQ;M{d&D)Q-5fx5piWr4X~(EO!i+LDMu_sF4&31zV_*{P^($;`a77 zcN~^MRaJ;zzI@@1!!m4cZbGy#-5JN)+8V@kI?Wx2Wk{#f5LZ`Mx#O@5tE;Q_EfAw9 z-U1N;;N81--0`$LMTa5)ynOkRH5e;UbZ8HBFn}Wi9Wt2=78Vw`<7!zJ78XhscuHfN zo<4ob7Er76?Af!@YkN3jos=EUxU;i^>FH^FJV8;80~Tdq{Y75D`M55EMlz zEjutId}Uh5OdGf^EKdl9b#bS8>{{4~V z_SD20sCsIms;U?tA2&U)R%LvA{8*Vq?CITAQ1kR|*aZlVP*(whVjCVF=FX#OsJlc) zu|=a%?p)Z3Mx&L;tW2mRN%Z2y3+|lQh{xl`mKg%##g<-!o5z@Ia!RxWCtN~J0}18SU5;7{50 zv9U4MCn{7+KA)$tv9abWyS~5K4+b!Pg9LyE1_qk42Grc#91RQ%n3A)pLW?aJ4AP@V zk662cLZLv9A3vsGFlcJ74G~&w9*?K=_@72}2m2rY&3~F zCvoD$2>?JopGPj2!}j(zzJLFY_4Rdp{`?u~bQ+4HV10d^ITPSF2tYu;G6!Js00000 LNkvXXu0mjf0iFvJ literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/history_down_shadow.png b/Telegram/Resources/icons/history_down_shadow.png new file mode 100644 index 0000000000000000000000000000000000000000..8317b07d1e90900db040d357f80cd17b0a67a78c GIT binary patch literal 1458 zcmV;j1x@;iP)hipkiq zwFIRmlhx4#JhZQT`m}vM&&LCR;2(s#iIe#Ke%!r#7c9#n z5D0*#X;2geLI`ZzMyJz(VHnVL9VaIz=ytn*ea$}>_xXI_I1bTh6rw015{ZE4dECE$ z9}L65>-B;V0?V>+dU}dhtA%E>2~}00Cjy{=muq;c~*Vjodmm}Z4 zeIvI;v)LrMT#l@-uM?JKCpw)Umv@H4VY0coN%HwTF%09@qz4#=LGt-L+1%VDp-|}0 z#Dl>g+1lD7dwYAtvaDN|9$;A(+1uMATU%Qs7z|!doTh2Av9Uo4g~C*&hvf@}0@>Ku zAT&*n6<-AK-|&R@cszLWzZ88h-8 z7X$&%o;^c4od&}&QxP2p!!Ssv(~xBujYb2is=E3YhJX0|exy<;@aqv8k zY&MHjDm8NFUE;A=44F&@Yiny$6`aJ{+8Q#M3}UgEtKAXz`Fx1S<47ixGo2zAVHgI< zWD@as96q1VX?Mgqjzc1mfGCPH5uAi5iby09;5g1{TNv(KU0nssvNMsJ1k18mSy^!f zbpbeAi^O6vL?V%y$^DLKG>TX(2AZY;oQnqn0cUACuY|*42!en>AOPT8oMl?t zd!wIZjd3Tt|Dr za9X$koTXCaiYe2)umJo@X6GHtvS8abfOGL~w+quWoyK{@wr!ZE>Expe0MKr?q3ilw zN8Pe493LN}-EIRo7uR(i&1Ms(Y0gw`5~gXQ*=$1BbpS&Vuh;81Iy#!E+$07YNv?=@ zIvvQeJd$P16RN60mSy)G2LMG;P^;CPTQN`Qx{g|{21QYvHb-33G)R)<>YNu8MS&zq z&@|0ybHsbS9;($UDwWDyJ*1{-qEe}#TCKWvc3nBAEXydBN;o(;n7ZI)92^{=R4PH1 zWmmgPyxZ-fTrQ(nEV^#Xtk5(K#bOcVa(Sc}FtQnWE}1 zPESvf&*zcL<;Ko{5pm$`ooQJX9z1veK@hOGxHtvXU-bKZynp{5J3Bl0@Zkgc{r5^)ht(@-cBu)V#F z-Q8UrA0JN~KT#Ywi@d6;Xfzry3SoBTP#OKeS@#@tpynOi*`}_Ma4CA-| zyK?c$3@gqv5((M$lh8b5bj6@;`g+gE$20ou}Y`L)4 z>%lZl{P^($s;c7f@DP$D;nSy2w_h$CW>BCNMG>)B41yql<2a{4JJ_Hc2)9}-Xqtw4 zy$)HHp(x5<6=?rhd>ERh5eNiaCGo+BtKaXV)9E-_R=eH4c67(_KVwH-6lu3ez5oCK M07*qoM6N<$g2!UDBme*a literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..8127513da33abb25a80b54e34bb19f59d227c7f3 GIT binary patch literal 3645 zcmWkx2{@Ep6dv2yM={C1g(jv#GK_tfE!p=$WQa^ul(BCidr?T?w~aNjCtDgz#P1hk zFm{c7N%sHtJ?Hyo=DGK~=f3B>=RJ2~O^kI}nRu8W5D4onJuOr4X%B8&1}J#mtdrJ; zKwz}DwA9T5ve(`QTFvTld=(5&hA>7NG%!>w6Xphjd-lx|(db|A)r8bE8ZiIuCn=8% zGg7rTclg1G3eD7q`DGR0+NKIL|DEHX0` z=XgQ93!Zhel96YY_m3ehX_NT|4@@_GE~%H@LAc&699% zrZviuUp@>*OU+W9hj^}&Z(?y_D}WCefuLbw@x?_N5f_e=Ukx>?h(c!Xljh|DmQR8O z-x|}eJ>gAvYp+JWE@T{*b++O3n$Rg4cHX?4){_+)a&zXvU^Vg*XS}dL(xq4W>cg_w z%xH6oC@qmNYh*N5wzteSRg`}DsY>?yG&|u@jrB+*sT%pw_NpuoD_1mCr_>-;)+tl` z=bBs-X&tP0VP+mJdP_r;J&ZumD=_VLmFd1$^VeKuz|ZHzIoRMQ?W2?6nCW1o{?mW} z95QEaYm9u)Ya-es6D!M8JmNX{n7^qa-?B7!2-{YT+1eC+$;o8?0>)b@W&)D>|Zmvmap$AI?A}%p%vvxjlPy3D*0`77?H4lN*NEKxaQ-g#H zeQPMq7_7m|w{vQrkIPdVmW4CXt*)&(hlB`rxumEk>f|%TbbiajaBPYUbr_JZl;8OH zemG*1w6=DYrBkhFxE(9|tSqxGs^?(<2`~0f9Vgq)0}e@Eb#o zbhqbu-S$M?T;n+HDd9~pcT}(N;CHydo1ntfzr+> zn2+F$2Z;w{1;t}$XD7%md;Rdfn7?KtpFV1{jZR&ybi^fog)nGEZLG@GJ~ckxP9_VV z9xMsskAAauxtw2l!~;SB?_#?@vh$^xdwb_4k&MDX20d#*RaiZ_Za}jX^h8Mj#JBD5 zizoXSK0(17V}Q_HEWuou7Q&zDG!fol8t8HCj-Y^m6c>wS_-9$1`Z=LE5p#>K-@oNR zt~O7O{K0E?eSDJI3zL7<7@VV}jZjC#&5lKGNh=rNJ%k-}45*f-m9qL>Kp2QbA`G?t z$|Ho7(# zw`?9K{{<`SLeH1hGk<4v8-cSG?eP)hxSx~8TCz_!7<@rL3w+ILj;s2k$~>N9&>rTAd{F?>q9+7)isaK2(> z99NGkJD@b6AaQ;Dnr|Z?;05!^4{f+S(2IFrh4iQY;L%-+@%DZ8Gwa3wSR(;XTtFER z2o?NZsaf&f6WCf?DWl;OpEnn41E?=k(%rZ-3!UBF=|OT1@B*<~)VU_hW~)LNO-IEw z%hITOH9%u*1cDr+hd3I97(m(qVKVwY;Oh!KOyG23YED<3)9@;S)M25QH1&y3(%o{W zH)^`O%DLaEUDs*!Mwj%s%G_V6Uy9vd8u#Li(x3ufO3dT5A2{kLXeNf_8j5!sd#3h? zc91ul7pqlM5p?HZF)4bYKmyWb4BJmc;BNq9U2ALrx<&mTVzl;__~K#@9)KMb#O#*5 zfkAVEA5^|YP2!ac{b!(^siJ>QPEjXODiMgG0)oW9E3%69Vl)m6*^?mLQH36QMZrW)9&uDL@zK$v-{5ptC_|(N)2BcJ!y=))~Wle?4>5z=0wy?-W^xFE6tuC}KEO9rn z{mZ=xnw$xO)+XKNp_qk^_s8sFf+Tya5KjVHqERU<%|MvqxS!oam}Sk-Uz+5joB19K zrD6km(u8WuxY&3>Lfm&$f?A-hlPo0}Jw0z^$$=T`t;wcZuaFR(-x|Gi@a)T* zs^nHrqq8Xp#^FJFPTPS`@PJ!k!YN0{#Lxa=KZ|3%e#qxcF5KrkZGkArpH*MX*I65; zT~>U4DC=%fUuh>DCVv)UeBr%M5cy29C+KXNLq15v{30=APNy_hKXc{Rfve2JDp$^d zX`{=_yv!H}*M|R`+WSo*Gk>(85n=h=`1}zqWJyVQmYClae2T*3?@w3aPcRPi#@$V% zuES9J%?I^;nRQ;1y`CbYN<0ZbS=^cSs0Lzo+7#cypb_n+{+4owmuBU;SjPGpP`d3W z38V)X>%8+vDbkYDScR0wW;ghzI^08V7ny-h^`qi>8Gg<(okLobA|AaSc;IzE#NVH2 z&vbJ(PsJoF;P~N?LqG7ylbI5=Gn6y4N86;K&i_!3Or8^osP*RUzsFH-**EOO-&493 z@C})b&e;O~w||_RDBsofe%swaoZIr+X2Kl`^;KJEDNNLXlLxBp;`8;1iMq80%3Lj! zDL%)#a&*W`PFb}C#Cd}|vtRtz9-5`|_5I@T(KG;x^2D-o)Y;~TK0n8gTl39V`&_&a zcoLxKw~0k51CV#dMa%m~Qbru03)_}gi`(&H*5L;arqmug#CT+`{+iL4*%iqjVgT*6 z)|M4C)?&+2tX$UZU!gk|+E3GhTa$ng=of@fOxXSBdGq7MS|fSa&;z-KZYEs=UV0Z~ zKqbl=X(BoO9`)L|Z$+0-(3JIYtnA?0lchp!rTZx!TOX0kplKJFGG-PkRCJd6ant#{ zjCQW7$Qki`RqnrIUwIj~y|5dOLZLuy{w0Vj%+HHX* z@_MI!ejS5StFv#!nO+{j868kEN)#8gbuy#mxLB0R z1^(Pn+$nEQ)8@dUu~)!huA!lAW#x*WaDi!$Gm5*lJInV5@RV z)s0O>BJ)wY;Kpl1ardu^O-opI{Js)&KeGL)8FXSzF0+4eax0Pcu$HL!nFse9DxeuV zNn^+nOG~NI{sEe?b?UeKp;x2=!(!FUZakhM7!A967ft(xu9VWa`^@_#E*CTsWpgqF zhYZ*<;a&a>GrV*SOTuQ>`dyp5GrGH`{c@!3019uQ4>Y?a*XIet%>q0rqPQj6WaqNs z`Xo%1rBgXH6YBbD|J*MW{d$1k^y=%!;eAD+q)X38*SeJRGG=!2F)F=L)BbepoPx0p n&30w%1r3!|A^&s~oY5qgC#4y literal 0 HcmV?d00001 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 +