void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-05 06:33:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed emoji display in reply markup button from bar for pinned messages.

Browse source
This commit is contained in:
23rd 2024-06-02 23:07:36 +03:00
parent 47ce34e987
commit 9c83b8bac5
2 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Telegram/SourceFiles/chat_helpers/chat_helpers.style
View file

@ -930,7 +930,12 @@ historyPinnedBotButton: RoundButton(defaultActiveButton) {
textTop: 6px; textTop: 6px;
padding: margins(2px, 10px, 10px, 9px); padding: margins(2px, 10px, 10px, 9px);
} }
historyPinnedBotButtonMaxWidth: 150px; historyPinnedBotLabel: FlatLabel(defaultFlatLabel) {
style: semiboldTextStyle;
align: align(center);
maxHeight: 30px;
}
historyPinnedBotButtonMaxWidth: 120px;
historyToDownPosition: point(12px, 10px); historyToDownPosition: point(12px, 10px);
historyToDownAbove: icon {{ "history_down_arrow", historyToDownFg }}; historyToDownAbove: icon {{ "history_down_arrow", historyToDownFg }};

24
Telegram/SourceFiles/history/history_widget.cpp
View file

@ -7249,10 +7249,27 @@ void HistoryWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
if ((rows.size() == 1) && (rows.front().size() == 1)) { if ((rows.size() == 1) && (rows.front().size() == 1)) {
const auto text = rows.front().front().text; const auto text = rows.front().front().text;
if (!text.isEmpty()) { if (!text.isEmpty()) {
const auto &st = st::historyPinnedBotButton;
auto button = object_ptr<Ui::RoundButton>( auto button = object_ptr<Ui::RoundButton>(
this, this,
rpl::single(text), rpl::never<QString>(),
st::historyPinnedBotButton); st);
const auto label = Ui::CreateChild<Ui::FlatLabel>(
button.data(),
text,
st::historyPinnedBotLabel);
if (label->width() > st::historyPinnedBotButtonMaxWidth) {
label->resizeToWidth(st::historyPinnedBotButtonMaxWidth);
}
button->setFullWidth(label->width()
+ st.padding.left()
+ st.padding.right()
+ st.height);
label->moveToLeft(
st.padding.left() + st.height / 2,
(button->height() - label->height()) / 2);
label->setTextColorOverride(st.textFg->c);
label->setAttribute(Qt::WA_TransparentForMouseEvents);
button->setTextTransform( button->setTextTransform(
Ui::RoundButton::TextTransform::NoTransform); Ui::RoundButton::TextTransform::NoTransform);
button->setFullRadius(true); button->setFullRadius(true);
@ -7262,9 +7279,6 @@ void HistoryWidget::refreshPinnedBarButton(bool many, HistoryItem *item) {
0, 0,
0); 0);
}); });
if (button->width() > st::historyPinnedBotButtonMaxWidth) {
button->setFullWidth(st::historyPinnedBotButtonMaxWidth);
}
struct State { struct State {
base::unique_qptr<Ui::PopupMenu> menu; base::unique_qptr<Ui::PopupMenu> menu;
}; };