From 7dfc27f3c95722630edc846d9f9f41085eaa18e1 Mon Sep 17 00:00:00 2001 From: AlexeyZavar Date: Thu, 16 Jan 2025 16:44:44 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20paddings=20&=20mark=20as=20=CE=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Telegram/Resources/icons/ayu/edited.png | Bin 264 -> 295 bytes Telegram/Resources/icons/ayu/edited@2x.png | Bin 401 -> 475 bytes Telegram/Resources/icons/ayu/edited@3x.png | Bin 527 -> 613 bytes Telegram/Resources/icons/ayu/trash_bin.png | Bin 285 -> 327 bytes Telegram/Resources/icons/ayu/trash_bin@2x.png | Bin 417 -> 462 bytes Telegram/Resources/icons/ayu/trash_bin@3x.png | Bin 492 -> 564 bytes Telegram/SourceFiles/ayu/ayu_settings.cpp | 2 +- .../ayu/ui/settings/settings_ayu.cpp | 8 ++++++-- .../history/view/history_view_bottom_info.cpp | 6 +++++- 9 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Telegram/Resources/icons/ayu/edited.png b/Telegram/Resources/icons/ayu/edited.png index d14626a9d04e001f5d237ebbf4304e5447a7f66d..775d7990882601b17899a99012e961a695f45337 100644 GIT binary patch delta 231 zcmV0;d9y7YY~%1^@s6`b*t*ks&pIyh%hsRCodHlz|DuAP_|_ogf<|qhy3^ zpd080j-VUpCgKE+WL2=VsL`fEX~_pc&hzoTQzrm$FiSiBs-}m?;mSuSt6vvdP hqx6U0*9H7R;2p|6Q!rPR7c>9>002ovPDHLkV1gczWSsy2 delta 200 zcmV;(05|`q0*C^T7YY;z1^@s6jfou%ks&pIok>JNRCodH)ZGn*APfcIdM986Mq&fl zh!Gfp5g3IL7@?PvG*MH3syuoU;)CS#lo%EOK$w^xOwI?MCxig4HK?_M_x^An-d!<9 zqz6G1%J;ke-h~!nl#OcC3`r_<$N@j6<#Z*T8KiMbDFdSM6&Nn8&dPV&yw4wuEGuo&t9~{B00004<1KR_T7YZ;41^@s6V|zH8ks&pIa7jc#RCodHn9-3$KoEv|ukM`?gdhYV z$N&+L0U3}183=(4grGz~26KAr=F06B+V%_{=Bt_)#`x;*X_N;52)Hp{aC3|x7bD2! z6hYgz!F65mJP$rW=o+(_D2hUi<0vG3--{p!j;y0kuIoCn#sNuvf?Hs!mkQ!&nr2gf za^9D_Ybb3J*$k2>ieQ?i)%liX0R^Rd4pUnm_kDjgLA-{rwmLaUk|b}E%T7k}Jg2U& zR!%ZM^Zw0q97mL8`8q2y!ukT#O(WBgn-FaxsEjj3AfW3;qBN?qTfuFNxm(00008NkvXX Hu0mjfiu=1r delta 338 zcmV-Y0j>Vq1Caxe7YZl{1^@s6jQ+T7ks&pICP_p=RCodH*HI0FFc1dd+Y}%H2{-@= zNB{*$00&4w0uqpd1aNTckw7*WqvhJJ5BDczq%`Eq^*Z1I00;r+34up|+z5~x0dgZi zZkz(+IEG;uV45aC#O0jEOoJ{C1;KF~aUX@nBuPx}ZQEj+rmkRSK&p~Q)OI{pWvG$Q kPHqIqjR3h3AUDASU(HR8FkvS48vpl*I(xZX z1|9Di-8jOZzC1<}BWijd%C*7Ic~=U5WQ1*2P<;}OI8IcavfmXRvRuUDOpy*e#+Pkl zs%g@~uCfi7z5!AW*zI=pYfMH-=h%@2-<0-A=MiOp-Ba2% zoySV!Hqp{K(EY6Mh?CCPf^~gbFuL&Rbg~x3OxSET6hz&H`_dWr>qj9}BKk6ZArSa% z==prYZ9}n(`Fn2_lJ0i>-5$28vb4P@^Bf{Jf qVeW`9cSM*wBFr5T=FaSd{{T-D<9%xs2sW?)0000DI6x4MMNs_?x`2?z{E3^Tm2B=y}+qTMa9E#t%26h;K zN%bp;#=h2recxAWlcuTtU~J#Y`E!(6fVYgYbzq!_VHi$6FUyi2cwC@{%g$s0TC;dz z>01N-1m$@?>4TRZoTp2ftBgy6mqu?6fPIUinDoWt3I2;YECx&4b=}$HhF#ZdwDEX? zYw+>lHS_Wt8k^^NRM=y|Yj;p1nqYo^ngegaz6a+n(VqD{@Luc~oVU0Uu>!1%#Skt~ z$AT@u(t<6((t)!qQ#v^bO9RGL)e@{Cd8Re2sIWIp(?Ade(Dyx@745UO_U7H>$O2VK z?=5FTSbZ>V@GZjXgSVEmVXPi_YdPb|F^ts%uPtZ16C!xLY99QnobmfOj;}C0sx)AW zkThT{Q%jJq_88T7iM$`?9szTYfVoG&+#_J_5is`%n0x*Kvx<0eT&-R^00000NkvXX Hu0mjfz17@h diff --git a/Telegram/Resources/icons/ayu/trash_bin.png b/Telegram/Resources/icons/ayu/trash_bin.png index 056b7d8dc2e1bc271c8f5a67e66ecbfe2c1c4b44..d04d36c13179c435c7b5914a079e5242a84a23b2 100644 GIT binary patch delta 263 zcmV+i0r>u%0>=W77YY~%1^@s6`b*t*ks&pI+(|@1RCodHl+g`@APk0o%)RRdI)WoO zlB4JZuAmdRf+Oez>I57m@j;+K2yb^^LShR2(iWlsAd!&*nfZhcv~7#3s`U51?|Oxh z+!}^Knsi+!eL0p;RU@0G(TV4ITEcZ*rK(z=aR~*COPQt#N`@HvzQ?jGub3r#pt(JA zvoi_J(JGtT2|;bUa-Gjc2@#?!OJ}@DX^FV+J6;%rdI9mm>$(tvtB}2AHFx+BLOA1W z%f2~o+s5v(!f_ngqcqDWCL&WaKAfTQC3#7xKWx+=ewuDHvmlq?GuCbksCW zXUDunHjrthH6VX-LfTjD6p$xc9!8(b=O}Iz6k$vMk+5 zC;xBCt^T|TA$)H*!a3Ky>kfs;?P@16)=R-Ni(^3ENyHe-R7rU^p|!@T3eRx=Hox-% X@~eQl9h70z00000NkvXXu0mjf8lq&l diff --git a/Telegram/Resources/icons/ayu/trash_bin@2x.png b/Telegram/Resources/icons/ayu/trash_bin@2x.png index 323f42a66eaddc45fdbb46d400e4e7dde8f3642e..7440cbb7cd80d805725b414c0bddd63b06d8dd01 100644 GIT binary patch delta 399 zcmV;A0dW4I1I`1G7YZ;41^@s6V|zH8ks&pIV@X6oRCodHn9+@cFbqJQ(+$7~Yycy$ z0c-%9FaoT=1i%Jtzz8q`OpwFqRJB!UV;j!cLZ@^Q{p&g3x14$ zL5!~~%O37+3+}^|wr!!VYgpIyc5fI4lO) zeWK+;Jt)>+G4(Bw1kY%lE){e>2G0OMols~7aNN#V+qwD|x002ovPDHLkV1l1Fv9kaG delta 354 zcmV-o0iFKN1EB+u7YZl{1^@s6jQ+T7ks&pIHc3Q5RCodHm)&iHPz*-DRDFjHU<23y zHh~S8feBavHh@iF0$>7Qf?FJwDov&6Ub{g&_(+yQ{&Zsd8s`SU;KF?1;;5h$6_lca zQdCgNCxoPFilQjs`~I)z`@Tn6mRQ#nQVci3Ff^~Is>(>d|2y~}-ZS@7a9I|!XI3PC zcsnd@$nzXQ5ZoVAN$L8zw9inf+qV6=Zkh(uG{FVyUqcy@l4aTZGDz9-JP#7)d3Jig zli(x!0l9|_bdssmT$~$s?>*y+YiW;Q4eBIG;0n!44yWBoxC5Id=sG5dQw9Iy_GJr8 zaN9Px!pS<$asU7T07*qoM6N<$f@Hg) A?*IS* diff --git a/Telegram/Resources/icons/ayu/trash_bin@3x.png b/Telegram/Resources/icons/ayu/trash_bin@3x.png index 02a715435d14bd69dd81f30bc05dc86bd5cbb82a..12704a4a5cf69a669b7c62b5369d8b87ead225b4 100644 GIT binary patch delta 502 zcmV1GEH?7YaxS1^@s6s!x`sks&pI$w@>(RCodHnc6yC=SwykAj^Kc?6Axx00Q2K54;&J zY#kT2jtg7o6N(InLu@u1%x1HP*WPY7?DuFj7RlB15J`7 z0R!3yvp>?c=!GydM!0Y+l6%sE*_pi%KAlcrLdg|Ll1&Tp#u}}nu-$G08>y3F*+!5n zqe`s)gsCGYIhHl$>cXV{|E_8_agD&d_Jp0e&1WNjtg7Ig{|Yl)^TC$xUh9x s*g7t39T&Ea3tPv9t>ePhabfFx0aRWv^WDhv=>Px#07*qoM6N<$f_)I}g8%>k delta 430 zcmV;f0a5<61ndKl7YaNG1^@s6I{evkks&pIfk{L`RCodHng6XsKoEfEUS0u8&;cE2 zK?h0^70`jGKvX~pIzR=eV4rz8_m8`T+gY(=zCqnxJi4D2f8kLYaKBEK_^vx=t+}Vze!P z&&S-ym&mFk#Bpr5aGvK!eAPIP_6obM`!8^mD2j{r!I^z1==ZX8?w^U1qZREuC>y9U43C1 z_k9o4kPiEGT`MZ^Th#3%Pic%S6__o5)Q}5fI$jys59>l1VG{$Eq_i%SQ8CeZm#$$e zgefCzMGapaa^YbZfC`B)0aC-dP&RU&XP`z_TDqVx#bF!nhpkz7P+XfVHx^(DW#Z8} z%`|xfVe}9WH}Ib4y$%IFZRpop#owx`jBY^W)RH?Q%pDQtjtFx{gt;Ta+!0|J?%YoJ Y4;i;xUy3c>f&c&j07*qoM6N<$g4)2p#{d8T diff --git a/Telegram/SourceFiles/ayu/ayu_settings.cpp b/Telegram/SourceFiles/ayu/ayu_settings.cpp index ec208a0df..b74233f59 100644 --- a/Telegram/SourceFiles/ayu/ayu_settings.cpp +++ b/Telegram/SourceFiles/ayu/ayu_settings.cpp @@ -240,7 +240,7 @@ AyuGramSettings::AyuGramSettings() { #endif ; simpleQuotesAndReplies = true; - replaceBottomInfoWithIcons = true; + replaceBottomInfoWithIcons = false; deletedMark = "🧹"; editedMark = Core::IsAppLaunched() ? tr::lng_edited(tr::now) : QString("edited"); recentStickersCount = 100; diff --git a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp index efba614cc..092455a0c 100644 --- a/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp +++ b/Telegram/SourceFiles/ayu/ui/settings/settings_ayu.cpp @@ -1325,7 +1325,8 @@ void SetupWideMultiplierSlider(not_null container, constexpr auto kMinSize = 1.00; // const auto kMaxSize = 4.00; constexpr auto kStep = 0.05; - const auto valueToIndex = [=](double value) { + const auto valueToIndex = [=](double value) + { return static_cast(std::round((value - kMinSize) / kStep)); }; const auto indexToValue = [=](int index) @@ -1460,7 +1461,10 @@ void SetupMarks(not_null container) { AddButtonWithIcon( container, - tr::ayu_ReplaceMarksWithIcons(), + tr::ayu_ReplaceMarksWithIcons() | rpl::map([=](QString val) + { + return val + " β"; + }), st::settingsButtonNoIcon )->toggleOn( rpl::single(settings->replaceBottomInfoWithIcons) diff --git a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp index d9abd270f..ce15289b6 100644 --- a/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp +++ b/Telegram/SourceFiles/history/view/history_view_bottom_info.cpp @@ -461,6 +461,9 @@ void BottomInfo::layoutDateText() { owner->customEmojiManager().registerInternalEmoji(icon, padding) ); deleted = Ui::Text::Colorized(added, 1); + if (!(_data.flags & Data::Flag::Edited)) { + deleted.append(' '); + } } TextWithEntities edited; @@ -472,12 +475,13 @@ void BottomInfo::layoutDateText() { owner->customEmojiManager().registerInternalEmoji(icon, padding) ); edited = Ui::Text::Colorized(added, 1); + edited.append(' '); } else if (_data.flags & Data::Flag::EstimateDate) { edited = TextWithEntities{ tr::lng_approximate(tr::now) + ' ' }; } const auto author = _data.author; - const auto prefix = !author.isEmpty() ? u", "_q : QString(); + const auto prefix = !author.isEmpty() ? (_data.flags & Data::Flag::Edited ? u" "_q : u", "_q) : QString(); const auto date = TextWithEntities{}.append(edited).append(QLocale().toString( _data.date.time(),