From ebb10fb8edc4c698000b2ce2bacd14acaec62752 Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 3 Jul 2017 13:51:38 +0300 Subject: [PATCH] Improve night mode theme. Also fix custom notification border painting with reply button. --- Telegram/Resources/icons/menu_night_mode.png | Bin 522 -> 489 bytes .../Resources/icons/menu_night_mode@2x.png | Bin 805 -> 1024 bytes Telegram/Resources/night.tdesktop-theme | Bin 8883 -> 8880 bytes .../window/notifications_manager_default.cpp | 13 +++++++------ 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Telegram/Resources/icons/menu_night_mode.png b/Telegram/Resources/icons/menu_night_mode.png index 8f31cc222a379454faa729ed68eac85458b5dcd4..bab9697fc0a7e5da1c3c54d8ee3fdd2cbdca5b8e 100644 GIT binary patch delta 463 zcmV;=0WkiG1nC2iB!93;L_t(YiOrS0t}#&_kVbldodP^aX1|Ee>I!U zXU*LJS(Z5(ja=sY{hqq6KWpv=SeE57C&_NN`-=H3AeBn-a5xA7l}hC$z|AQtl}ZSO zLc)`<*=&UCk8}gb<#L{l(P;F2Kr)&1Y|LabF9Cob^I9&K!ugZr<#J&@pMNi8$8kIX zBsrN(7>Pt)2Y>YY{ks5?v~8QJs{R__1Mq#Fm8NNTg9d;^B7tJD2*2Nt^?Hr-`HWyN zh

!!S@N6kyx7ID>olK&0dGNXKzFo6We}?MRY~#p3==u2!qR28dKHm+u1?i1{}xn-2V{pu0Hh delta 496 zcmVFTp)qLc z69f(ILA*m#Q=cGc3!$l1iomtcpwOyA5Dk)?J6ycvn|ihT#{0m3(ZloO_#Dsw4FKVV zdVi(){|E3q4^7iBolapG23*(0a=C;gNvQ!JaW5ES7>~yo4u6LbMG*ktc^(|c!R2yE z4FJAE4jn~N=x{jDy>7P~tyU`%1mU6nhZBCl7<(`$BC;%t>h*e7^DuzpIGWGr59UNf zx~>z?^S=XVnnu^_H4-qJ&7Lu*&=mE0JqUsj8C2F_1BC#sRx7qJpU?jupeRagVWm>Z zH2;x+xX%LswSQU-olYk+0JsapvaHB}1DU2trBdnnDcbM%i2x#^?RHDmYBe>01Mnwk zrC2PY-EJqgtEws*jRp#Z0sz4GeTbrna=DDbV1RD7i`{PbUH=xe0RWn&;dneIW)aBu zeVk4woX=+ffGCP!jKOgn$g&)rLDHX`R-@7Axm}b-x@oSHBuU8t0HmranWmY^e6!gQ zW9;W`df&-nv54JGfn3+6$z(#gTrScl6!PB+ZnS>Ck7lz8S(d?Z96Zm1ZQC#m1MBq~ mwr#`r{YZ~Qz`xMTFa1w)wpxxqrXf-Q0000@4lxndnl<#Fc)i}A zCE##4Xm4*XXK*5-rKKg(>2yCwz~k{yJRX-6er;`y3_npdppX?%48Qbo6TStMpY;|hzcl~eE?ut7PYmtiUY|-RG_)JSy4f~UXPBB z4#k1wA}YYLtm2~m{r%AE^@{t;CF}kgjYehd|DSQY-Nijhs1*nV0#s5`QapjHt1DFk zL`0L5lYhk%*x%n*Ef9%BsIRZDI7f+4C?xigWLTEP>gp$pQ7xoge+wGK2r}HKu2m<;2erj!PCB0rRDO^KC1G!wTFMk|q-Yq^;QBi@7jSckn z_NrXqk7P0#`2ButZ*L1<5Cj;FMt_*iW>_p1IGs)m4-dm)v0#0D9fN~| zS?h@k0KnAL6joMN@+$Br(P$L$cpRxz3W6ZOU@*XBGNHb{{=4;G8&D_w$aaRWMqWi-rfop{`&fwY&M(n=RmeLJv}Y!?VM6BFE6RBtxes7OstKK zjnTuy!?%S$IXTI7)2b5yK%JePbaZr-*Wj=;;>G1GSR%B>F5NLCAlX#vdhG7(s|K(9a4%OAwuv)Ef zyWMcPT;Mnk48x$bv=l^ybUKYhB7w8BGXw$w93LO!;^G32kB_Rx&6_~6_~-v8{uL-T Z{{cJ@og3{Pf$0DM002ovPDHLkV1gDA-J}2j delta 783 zcmV+q1MvKS2&D#)BYy(yNklL>pS6(3n+))D{GnZ5OpJ6)ZkM z`ULG>O8Y2MbmgiKptx!UD^is1%alL@)5OMkBG(r7fITrL;Zt^NVB zO;uIcwvE@i9`amTJ6W+ z0Kgc--rnA-!;1+RhJm-Yw}s)S(<#o+&({&2U%)U7Fvb>!2Y`CLzOL|m0=lkaFc@%! z_dE~B$H$u`@PGLD$Q2#{US3|-8Gf-qu~_5|4*+*}cbg*+i^VV=kA(yZg~H|t*tRVc z9so?!+#G>kuO}?9h8Gu~fMr>M<-sNi1Qv7Ua+wrG2|66e{{Fu3HOmkvaCvzt)#1s> ziF6nl0tIBt-;0Y2=`b<`3LG9DN_AMNRHVbm;yXE9*MAkBz`*)TiO@eO6-A-@`}?rF z{SjZY$z&om0>H0w`t0m1+V{Zw`@6IN0630=-QC^j9-;AgEI5#Vlg(!7>FJ3yOJiZ*P|xfjO;KYt9;RtR(==$B2GcZ=&*xFCR?+QtF`La`+qS%b zs;Ue3epZR&I8aqpUVupalQK+7rIP$4{FAXO2sWeL`bDl7!HRk3qKqVkxHdR!heei5D|8EcDOcoMXA+lNF)-X;l%~! ztyC(7@<=hpcvqWn1&DtC;OO`J!evLl-^ca!HP1T#V^ii9%VJp;U0q#Kp-`Y~HcRPr znv%&R5fOcTebMLVCo#sT*XvQc-KLL^k1%dap$SCA_Ah1BYz3m`8`8ZQ{z3H^jsO4v N00>D%PDHLkV1hN5d*lEB diff --git a/Telegram/Resources/night.tdesktop-theme b/Telegram/Resources/night.tdesktop-theme index fa7ba86f6d9f262ec7e718c4e5c6b2e49201e3aa..035ed030dcb9dd3b355acb26eeac24e78eb90b39 100644 GIT binary patch delta 7816 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 delta 7819 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 diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp index f419c9ddbc..85ea96e539 100644 --- a/Telegram/SourceFiles/window/notifications_manager_default.cpp +++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp @@ -542,16 +542,17 @@ void Notification::prepareActionsCache() { auto replyCache = myGrab(_reply); auto fadeWidth = st::notifyFadeRight.width(); auto actionsTop = st::notifyTextTop + st::msgNameFont->height; - auto actionsCacheWidth = _reply->width() + _replyPadding + fadeWidth; - auto actionsCacheHeight = height() - actionsTop; - auto actionsCacheImg = QImage(actionsCacheWidth * cIntRetinaFactor(), actionsCacheHeight * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied); + auto replyRight = _replyPadding - st::notifyBorderWidth; + auto actionsCacheWidth = _reply->width() + replyRight + fadeWidth; + auto actionsCacheHeight = height() - actionsTop - st::notifyBorderWidth; + auto actionsCacheImg = QImage(QSize(actionsCacheWidth, actionsCacheHeight) * cIntRetinaFactor(), QImage::Format_ARGB32_Premultiplied); actionsCacheImg.setDevicePixelRatio(cRetinaFactor()); actionsCacheImg.fill(Qt::transparent); { Painter p(&actionsCacheImg); st::notifyFadeRight.fill(p, rtlrect(0, 0, fadeWidth, actionsCacheHeight, actionsCacheWidth)); p.fillRect(rtlrect(fadeWidth, 0, actionsCacheWidth - fadeWidth, actionsCacheHeight, actionsCacheWidth), st::notificationBg); - p.drawPixmapRight(_replyPadding, _reply->y() - actionsTop, actionsCacheWidth, replyCache); + p.drawPixmapRight(replyRight, _reply->y() - actionsTop, actionsCacheWidth, replyCache); } _buttonsCache = App::pixmapFromImageInPlace(std::move(actionsCacheImg)); } @@ -609,9 +610,9 @@ void Notification::paintEvent(QPaintEvent *e) { auto buttonsTop = st::notifyTextTop + st::msgNameFont->height; if (a_actionsOpacity.animating(getms())) { p.setOpacity(a_actionsOpacity.current()); - p.drawPixmapRight(0, buttonsTop, width(), _buttonsCache); + p.drawPixmapRight(st::notifyBorderWidth, buttonsTop, width(), _buttonsCache); } else if (_actionsVisible) { - p.drawPixmapRight(0, buttonsTop, width(), _buttonsCache); + p.drawPixmapRight(st::notifyBorderWidth, buttonsTop, width(), _buttonsCache); } }