kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Renamed contentWidth property to minWidth in menu items.

Browse source
This commit is contained in:
23rd 2021-01-14 01:48:17 +03:00
parent 0d6a0d9cef
commit 5d74463bc9
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ui/widgets/menu/menu.cpp
View file

@ -123,7 +123,7 @@ not_null<QAction*> Menu::addAction(base::unique_qptr<ItemBase> widget) {
} }
}, widget->lifetime()); }, widget->lifetime());
widget->contentWidthValue( widget->minWidthValue(
) | rpl::start_with_next([=] { ) | rpl::start_with_next([=] {
const auto newWidth = _forceWidth const auto newWidth = _forceWidth
? _forceWidth ? _forceWidth
@ -132,7 +132,7 @@ not_null<QAction*> Menu::addAction(base::unique_qptr<ItemBase> widget) {
: (*ranges::max_element( : (*ranges::max_element(
_actionWidgets, _actionWidgets,
std::greater<>(), std::greater<>(),
&ItemBase::width))->contentWidth(); &ItemBase::width))->minWidth();
resizeFromInner(newWidth, height()); resizeFromInner(newWidth, height());
}, widget->lifetime()); }, widget->lifetime());

2
ui/widgets/menu/menu_action.cpp
View file

@ -149,7 +149,7 @@ void Action::processAction() {
const auto w = std::clamp(goodWidth, _st.widthMin, _st.widthMax); const auto w = std::clamp(goodWidth, _st.widthMin, _st.widthMax);
_textWidth = w - (goodWidth - textWidth); _textWidth = w - (goodWidth - textWidth);
_shortcut = actionShortcut; _shortcut = actionShortcut;
setContentWidth(w); setMinWidth(w);
update(); update();
} }

12
ui/widgets/menu/menu_item_base.cpp
View file

@ -69,12 +69,12 @@ rpl::producer<CallbackData> ItemBase::clicks() const {
}); });
} }
rpl::producer<int> ItemBase::contentWidthValue() const { rpl::producer<int> ItemBase::minWidthValue() const {
return _contentWidth.value(); return _minWidth.value();
} }
int ItemBase::contentWidth() const { int ItemBase::minWidth() const {
return _contentWidth.current(); return _minWidth.current();
} }
bool ItemBase::hasSubmenu() const { bool ItemBase::hasSubmenu() const {
@ -107,8 +107,8 @@ void ItemBase::initResizeHook(rpl::producer<QSize> &&size) {
}, lifetime()); }, lifetime());
} }
void ItemBase::setContentWidth(int w) { void ItemBase::setMinWidth(int w) {
_contentWidth = w; _minWidth = w;
} }
void ItemBase::finishAnimating() { void ItemBase::finishAnimating() {

8
ui/widgets/menu/menu_item_base.h
View file

@ -32,9 +32,9 @@ public:
rpl::producer<CallbackData> clicks() const; rpl::producer<CallbackData> clicks() const;
rpl::producer<int> contentWidthValue() const; rpl::producer<int> minWidthValue() const;
int contentWidth() const; int minWidth() const;
void setContentWidth(int w); void setMinWidth(int w);
bool hasSubmenu() const; bool hasSubmenu() const;
void setHasSubmenu(bool value); void setHasSubmenu(bool value);
@ -60,7 +60,7 @@ private:
rpl::variable<bool> _selected = false; rpl::variable<bool> _selected = false;
rpl::event_stream<> _clicks; rpl::event_stream<> _clicks;
rpl::variable<int> _contentWidth = 0; rpl::variable<int> _minWidth = 0;
TriggeredSource _lastTriggeredSource = TriggeredSource::Mouse; TriggeredSource _lastTriggeredSource = TriggeredSource::Mouse;