diff --git a/Telegram/Resources/langs/lang.strings b/Telegram/Resources/langs/lang.strings index 29f070cfa..a585d93b7 100644 --- a/Telegram/Resources/langs/lang.strings +++ b/Telegram/Resources/langs/lang.strings @@ -2196,7 +2196,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL "lng_polls_create_settings" = "Settings"; "lng_polls_create_hint" = "Tap to select the right option"; "lng_polls_create_anonymous" = "Anonymous Votes"; -"lng_polls_create_multiple_choice" = "Multiple Choice"; +"lng_polls_create_multiple_choice" = "Multiple Answers"; "lng_polls_create_quiz_mode" = "Quiz Mode"; "lng_polls_create_button" = "Create"; diff --git a/Telegram/SourceFiles/boxes/boxes.style b/Telegram/SourceFiles/boxes/boxes.style index 43a2fa2c0..8ac67fcba 100644 --- a/Telegram/SourceFiles/boxes/boxes.style +++ b/Telegram/SourceFiles/boxes/boxes.style @@ -937,3 +937,16 @@ pollResultsVotesCount: FlatLabel(defaultFlatLabel) { textFg: windowSubTextFg; } pollResultsHeaderPadding: margins(22px, 8px, 22px, 8px); +pollResultsShowMore: SettingsButton { + textFg: lightButtonFg; + textFgOver: lightButtonFgOver; + textBg: windowBg; + textBgOver: windowBgOver; + + font: semiboldFont; + + height: 20px; + padding: margins(71px, 10px, 8px, 8px); + + ripple: defaultRippleAnimation; +} diff --git a/Telegram/SourceFiles/boxes/poll_results_box.cpp b/Telegram/SourceFiles/boxes/poll_results_box.cpp index 5e326d604..b1a746521 100644 --- a/Telegram/SourceFiles/boxes/poll_results_box.cpp +++ b/Telegram/SourceFiles/boxes/poll_results_box.cpp @@ -277,7 +277,7 @@ void CreateAnswerRows( lt_count_decimal, rpl::single(answer.votes + 0.), Ui::Text::Upper), - st::infoMainButton)), + st::pollResultsShowMore)), style::margins()); more->toggle(answer.votes > kFirstPage, anim::type::instant); more->entity()->setClickedCallback([=] { diff --git a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp index 6547ab95a..b89eb1eff 100644 --- a/Telegram/SourceFiles/history/view/media/history_view_poll.cpp +++ b/Telegram/SourceFiles/history/view/media/history_view_poll.cpp @@ -256,11 +256,8 @@ bool Poll::canSendVotes() const { } bool Poll::showVotersCount() const { - if (!_totalVotes) { - return true; - } return showVotes() - ? !(_flags & PollData::Flag::PublicVotes) + ? (!_totalVotes || !(_flags & PollData::Flag::PublicVotes)) : !(_flags & PollData::Flag::MultiChoice); }