From 5d74463bc94776b7ebbbfbf7b845650681ae9b2f Mon Sep 17 00:00:00 2001
From: 23rd <23rd@vivaldi.net>
Date: Thu, 14 Jan 2021 01:48:17 +0300
Subject: [PATCH] Renamed contentWidth property to minWidth in menu items.

---
 ui/widgets/menu/menu.cpp           |  4 ++--
 ui/widgets/menu/menu_action.cpp    |  2 +-
 ui/widgets/menu/menu_item_base.cpp | 12 ++++++------
 ui/widgets/menu/menu_item_base.h   |  8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/ui/widgets/menu/menu.cpp b/ui/widgets/menu/menu.cpp
index 5f2a1ea..3701532 100644
--- a/ui/widgets/menu/menu.cpp
+++ b/ui/widgets/menu/menu.cpp
@@ -123,7 +123,7 @@ not_null<QAction*> Menu::addAction(base::unique_qptr<ItemBase> widget) {
 		}
 	}, widget->lifetime());
 
-	widget->contentWidthValue(
+	widget->minWidthValue(
 	) | rpl::start_with_next([=] {
 		const auto newWidth = _forceWidth
 			? _forceWidth
@@ -132,7 +132,7 @@ not_null<QAction*> Menu::addAction(base::unique_qptr<ItemBase> widget) {
 			: (*ranges::max_element(
 				_actionWidgets,
 				std::greater<>(),
-				&ItemBase::width))->contentWidth();
+				&ItemBase::width))->minWidth();
 		resizeFromInner(newWidth, height());
 	}, widget->lifetime());
 
diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp
index 2442bb9..955a722 100644
--- a/ui/widgets/menu/menu_action.cpp
+++ b/ui/widgets/menu/menu_action.cpp
@@ -149,7 +149,7 @@ void Action::processAction() {
 	const auto w = std::clamp(goodWidth, _st.widthMin, _st.widthMax);
 	_textWidth = w - (goodWidth - textWidth);
 	_shortcut = actionShortcut;
-	setContentWidth(w);
+	setMinWidth(w);
 	update();
 }
 
diff --git a/ui/widgets/menu/menu_item_base.cpp b/ui/widgets/menu/menu_item_base.cpp
index d9e28b5..68fddb9 100644
--- a/ui/widgets/menu/menu_item_base.cpp
+++ b/ui/widgets/menu/menu_item_base.cpp
@@ -69,12 +69,12 @@ rpl::producer<CallbackData> ItemBase::clicks() const {
 	});
 }
 
-rpl::producer<int> ItemBase::contentWidthValue() const {
-	return _contentWidth.value();
+rpl::producer<int> ItemBase::minWidthValue() const {
+	return _minWidth.value();
 }
 
-int ItemBase::contentWidth() const {
-	return _contentWidth.current();
+int ItemBase::minWidth() const {
+	return _minWidth.current();
 }
 
 bool ItemBase::hasSubmenu() const {
@@ -107,8 +107,8 @@ void ItemBase::initResizeHook(rpl::producer<QSize> &&size) {
 	}, lifetime());
 }
 
-void ItemBase::setContentWidth(int w) {
-	_contentWidth = w;
+void ItemBase::setMinWidth(int w) {
+	_minWidth = w;
 }
 
 void ItemBase::finishAnimating() {
diff --git a/ui/widgets/menu/menu_item_base.h b/ui/widgets/menu/menu_item_base.h
index c52ed30..4dbe242 100644
--- a/ui/widgets/menu/menu_item_base.h
+++ b/ui/widgets/menu/menu_item_base.h
@@ -32,9 +32,9 @@ public:
 
 	rpl::producer<CallbackData> clicks() const;
 
-	rpl::producer<int> contentWidthValue() const;
-	int contentWidth() const;
-	void setContentWidth(int w);
+	rpl::producer<int> minWidthValue() const;
+	int minWidth() const;
+	void setMinWidth(int w);
 
 	bool hasSubmenu() const;
 	void setHasSubmenu(bool value);
@@ -60,7 +60,7 @@ private:
 	rpl::variable<bool> _selected = false;
 	rpl::event_stream<> _clicks;
 
-	rpl::variable<int> _contentWidth = 0;
+	rpl::variable<int> _minWidth = 0;
 
 	TriggeredSource _lastTriggeredSource = TriggeredSource::Mouse;