From f1ffe2a641ca9ad6fab5eb54c6ab60c9f944dd08 Mon Sep 17 00:00:00 2001 From: 23rd <23rd@vivaldi.net> Date: Wed, 22 Jan 2025 10:21:22 +0300 Subject: [PATCH] Added icon to webview buttons from bot keyboards. --- .../Resources/icons/chat/markup_webview.png | Bin 0 -> 663 bytes .../icons/chat/markup_webview@2x.png | Bin 0 -> 761 bytes .../icons/chat/markup_webview@3x.png | Bin 0 -> 1119 bytes .../history/history_item_components.cpp | 18 +++++++++++++++++- Telegram/SourceFiles/ui/chat/chat.style | 2 ++ 5 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 Telegram/Resources/icons/chat/markup_webview.png create mode 100644 Telegram/Resources/icons/chat/markup_webview@2x.png create mode 100644 Telegram/Resources/icons/chat/markup_webview@3x.png diff --git a/Telegram/Resources/icons/chat/markup_webview.png b/Telegram/Resources/icons/chat/markup_webview.png new file mode 100644 index 0000000000000000000000000000000000000000..801937d7c6bc79c7820f888051ef0e00731bbe50 GIT binary patch literal 663 zcmeAS@N?(olHy`uVBq!ia0vp^JRr=$1|-8uW1a&k#^NA%Cx&(BWL^R}0jUw5X}-P; zT0k}j0~4bV12aeo5Hhr9GO&Qz3=C>Ont_3N0V6_o0TW!7X8|*U4N}N>@rpB$jLZy) zD2ed(u}aR*)k{ptPfFFR$SnXVV6dsM0y1+`OA-|-a&z*EttxDlz$&bOY>=?Nk^)#s zNw%$0gl~X?bAC~(f|;Iyo`I4bmx6+VO;JjkRgjAtR6CGotCUevQedU8UtV6WS8lAA zUzDzIXlZGwZ(yWvWTXpJp<7&;SCUwvn^&w1F$89gOKNd)QD#9&W`3Rm$lS!F{L&Iz zB_)tWZ~$>KW+6%?4_<0f}1q7iFdbZ3dZdXJ`Xfi6REI z$3`DyIg(=_J_U;cy=up0qYn=@J1)t%hwQ+RoZ#u=7@{G%H87fsMUkibbkl=_Hl5`k znd++iF0S`mTq4<4`8Q{Q*z6@CuNgXyW!J1YW4ZV{pP(gg(G>|7?p1r)O|t}!J2x7# zWv$Iv8@YIKFVdQ&MBb@0MNn67ytkO literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/chat/markup_webview@2x.png b/Telegram/Resources/icons/chat/markup_webview@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..068f4f00b5ecb3580c9215ad60508f6dd739e5d3 GIT binary patch literal 761 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|0#YM9(|mmy zw18|51|~)!24;{FAY^FIWMBca85q=nGy?H~Vi|EZjLn1Rn zB1$5BeXNr6bM+Ea@{>~aDsl@z3K(oEtboki)RIJnirk#MVyg;UC9n!BAR8pCucQE0 zQj%?}6yY17;GAESs$iyPpl6_D$EBd4U{jQmW)z9|8>y;bp zKhp88yV>WRp=I1=9MH?=;jqGLkxkLMfuL^+7WFhI$72aI=A0Z9t+{{zaLoK$}74+Zoz`RicPN z?Xl4ZS&rlwh)=K$C=+hIt2tSTA1d4{NNUM;QUqxiMA=J zlCFVU>bCyA^WBzHF++kaTTW+IbfC!MpsYWp0o-h#r~PU3*S2SU?&`>*BX+TxA^MTU zykqBCB@zlV8W+zqJ}}jH+SZdAFLw2%jzb2A9@#ixQnXS>LevH9ya{i0`c<~_jqI_h_=Q+y0!SCwko|T%+dZ1>@FROK1 w8Cq&$EDnBR6`1w-mG)(!goUd&eV2dBdVOkQV!Z literal 0 HcmV?d00001 diff --git a/Telegram/Resources/icons/chat/markup_webview@3x.png b/Telegram/Resources/icons/chat/markup_webview@3x.png new file mode 100644 index 0000000000000000000000000000000000000000..d52aa42c98d39d4a9a0c4b63869649601ee8cd1e GIT binary patch literal 1119 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbBSkfJR9T^xl_H+M9WCijSl0AZa z85pY67#JE_7#My5g&JNkFq9fFFuY1&V6Xz}5igjtE6@fg5s(_;nda-upao=eFfcI+ zF)#yJj6lfHp2@%hW-~AVO#%Yu1&j#U1x#>Rl?BWQHb|kx<+G0%7?=z)Ln2Bde0{8v z^K1^l#~=$>Fbx5m+O@q>*W`v>l<2H zTIw4Z=^Gj80#)c1SLT%@R_NvxD?a#8ycOWDy)d z+?iUDiLfcJ80syc2lYWR`i6Q2`q;FUWTxTJ29kkj1N#eNoejt^tANak)SO6{%-qzx zVxZIPjLmGowqQsg+zHX>oS&0l6kL#)oN8wX)q*61t{QAj1TJfkB#<Qr4Ja+x4=9035Rk;43 zMkRM=(-z^Ir7PBDzuMKeEK@1@j4p4)0hVup3M=PcGvUqtApIcX^Sq+lvPLti6vb zI^Ud0F6*2UngCro Bb)f(N literal 0 HcmV?d00001 diff --git a/Telegram/SourceFiles/history/history_item_components.cpp b/Telegram/SourceFiles/history/history_item_components.cpp index 7ea8597bb..2fe99415b 100644 --- a/Telegram/SourceFiles/history/history_item_components.cpp +++ b/Telegram/SourceFiles/history/history_item_components.cpp @@ -20,6 +20,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/chat/chat_style.h" #include "ui/chat/chat_theme.h" #include "ui/painter.h" +#include "ui/rect.h" #include "ui/power_saving.h" #include "history/history.h" #include "history/history_item.h" @@ -1080,7 +1081,22 @@ void ReplyKeyboard::Style::paintButton( tx += (tw - st::botKbStyle.font->elidew) / 2; tw = st::botKbStyle.font->elidew; } - button.text.drawElided(p, tx, rect.y() + _st->textTop + ((rect.height() - _st->height) / 2), tw, 1, style::al_top); + button.text.drawElided( + p, + tx, + rect.y() + _st->textTop + ((rect.height() - _st->height) / 2), + tw, + 1, + style::al_top); + if (button.type == HistoryMessageMarkupButton::Type::SimpleWebView) { + const auto &icon = st::markupWebview; + st::markupWebview.paint( + p, + rect::right(rect) - icon.width() - _st->padding / 2, + rect.y() + _st->padding / 2, + rect.width(), + p.pen().color()); + } } void HistoryMessageReplyMarkup::createForwarded( diff --git a/Telegram/SourceFiles/ui/chat/chat.style b/Telegram/SourceFiles/ui/chat/chat.style index 3dda7dd8b..d6b30390c 100644 --- a/Telegram/SourceFiles/ui/chat/chat.style +++ b/Telegram/SourceFiles/ui/chat/chat.style @@ -1219,3 +1219,5 @@ chatUniqueTextPadding: margins(12px, 2px, 12px, 8px); chatUniqueTableSkip: 9px; chatUniqueRowSkip: 4px; chatUniqueButtonPadding: margins(12px, 4px, 12px, 16px); + +markupWebview: icon {{ "chat/markup_webview", windowFg }};