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

Moved out down arrow icon of "Show More" button to single place.

Browse source
This commit is contained in:
23rd 2024-11-16 07:28:54 +03:00
parent 5eb59a1a43
commit f7ca8212aa
4 changed files with 32 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
Telegram/SourceFiles/info/channel_statistics/earn/info_channel_earn_list.cpp
View file

@ -119,27 +119,6 @@ void ShowMenu(not_null<Ui::GenericBox*> box, const QString &text) {
}); });
} }
void AddArrow(not_null<Ui::RpWidget*> parent) {
const auto arrow = Ui::CreateChild<Ui::RpWidget>(parent.get());
arrow->paintRequest(
) | rpl::start_with_next([=](const QRect &r) {
auto p = QPainter(arrow);
const auto path = Ui::ToggleUpDownArrowPath(
st::statisticsShowMoreButtonArrowSize,
st::statisticsShowMoreButtonArrowSize,
st::statisticsShowMoreButtonArrowSize,
st::mainMenuToggleFourStrokes,
0.);
auto hq = PainterHighQualityEnabler(p);
p.fillPath(path, st::lightButtonFg);
}, arrow->lifetime());
arrow->resize(Size(st::statisticsShowMoreButtonArrowSize * 2));
arrow->move(st::statisticsShowMoreButtonArrowPosition);
arrow->show();
}
void AddHeader( void AddHeader(
not_null<Ui::VerticalLayout*> content, not_null<Ui::VerticalLayout*> content,
tr::phrase<> text) { tr::phrase<> text) {
@ -1372,7 +1351,7 @@ void InnerWidget::fill() {
) | tr::to_count()), ) | tr::to_count()),
st::statisticsShowMoreButton))); st::statisticsShowMoreButton)));
const auto button = wrap->entity(); const auto button = wrap->entity();
AddArrow(button); Ui::AddToggleUpDownArrowToMoreButton(button);
wrap->toggle(true, anim::type::instant); wrap->toggle(true, anim::type::instant);
const auto handleReceived = [=]( const auto handleReceived = [=](

23
Telegram/SourceFiles/info/statistics/info_statistics_list_controllers.cpp
View file

@ -60,27 +60,6 @@ constexpr auto kColorIndexPending = int(4);
+ (entry.in ? '1' : '0')); + (entry.in ? '1' : '0'));
} }
void AddArrow(not_null<Ui::RpWidget*> parent) {
const auto arrow = Ui::CreateChild<Ui::RpWidget>(parent.get());
arrow->paintRequest(
) | rpl::start_with_next([=](const QRect &r) {
auto p = QPainter(arrow);
const auto path = Ui::ToggleUpDownArrowPath(
st::statisticsShowMoreButtonArrowSize,
st::statisticsShowMoreButtonArrowSize,
st::statisticsShowMoreButtonArrowSize,
st::mainMenuToggleFourStrokes,
0.);
auto hq = PainterHighQualityEnabler(p);
p.fillPath(path, st::lightButtonFg);
}, arrow->lifetime());
arrow->resize(Size(st::statisticsShowMoreButtonArrowSize * 2));
arrow->move(st::statisticsShowMoreButtonArrowPosition);
arrow->show();
}
void AddSubtitle( void AddSubtitle(
not_null<Ui::VerticalLayout*> container, not_null<Ui::VerticalLayout*> container,
rpl::producer<QString> title) { rpl::producer<QString> title) {
@ -1308,7 +1287,7 @@ not_null<Ui::SlideWrap<Ui::SettingsButton>*> AddShowMoreButton(
std::move(title), std::move(title),
st::statisticsShowMoreButton)), st::statisticsShowMoreButton)),
{ 0, -st::settingsButton.padding.top(), 0, 0 }); { 0, -st::settingsButton.padding.top(), 0, 0 });
AddArrow(wrap->entity()); Ui::AddToggleUpDownArrowToMoreButton(wrap->entity());
return wrap; return wrap;
} }

26
Telegram/SourceFiles/ui/effects/toggle_arrow.cpp
View file

@ -7,6 +7,12 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
*/ */
#include "ui/effects/toggle_arrow.h" #include "ui/effects/toggle_arrow.h"
#include "ui/rp_widget.h"
#include "ui/painter.h"
#include "ui/rect.h"
#include "styles/style_statistics.h"
#include "styles/style_window.h"
#include <QtCore/QtMath> #include <QtCore/QtMath>
namespace Ui { namespace Ui {
@ -50,4 +56,24 @@ namespace Ui {
return path; return path;
} }
void AddToggleUpDownArrowToMoreButton(not_null<Ui::RpWidget*> parent) {
const auto arrow = Ui::CreateChild<Ui::RpWidget>(parent.get());
arrow->paintRequest() | rpl::start_with_next([=](const QRect &r) {
auto p = QPainter(arrow);
const auto path = ToggleUpDownArrowPath(
st::statisticsShowMoreButtonArrowSize,
st::statisticsShowMoreButtonArrowSize,
st::statisticsShowMoreButtonArrowSize,
st::mainMenuToggleFourStrokes,
0.);
auto hq = PainterHighQualityEnabler(p);
p.fillPath(path, st::lightButtonFg);
}, arrow->lifetime());
arrow->resize(Size(st::statisticsShowMoreButtonArrowSize * 2));
arrow->move(st::statisticsShowMoreButtonArrowPosition);
arrow->show();
}
} // namespace Ui } // namespace Ui

4
Telegram/SourceFiles/ui/effects/toggle_arrow.h
View file

@ -9,6 +9,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
namespace Ui { namespace Ui {
class RpWidget;
[[nodiscard]] QPainterPath ToggleUpDownArrowPath( [[nodiscard]] QPainterPath ToggleUpDownArrowPath(
float64 x, float64 x,
float64 y, float64 y,
@ -16,4 +18,6 @@ namespace Ui {
float64 fourStrokes, float64 fourStrokes,
float64 progress); float64 progress);
void AddToggleUpDownArrowToMoreButton(not_null<Ui::RpWidget*> parent);
} // namespace Ui } // namespace Ui