Moved all files related to menu to separate namespace.

CMakeLists.txt

@@ -146,8 +146,8 @@ PRIVATE
     ui/widgets/input_fields.h
     ui/widgets/labels.cpp
     ui/widgets/labels.h
-    ui/widgets/menu.cpp
-    ui/widgets/menu.h
+    ui/widgets/menu/menu.cpp
+    ui/widgets/menu/menu.h
     ui/widgets/menu/menu_action.cpp
     ui/widgets/menu/menu_action.h
     ui/widgets/menu/menu_common.h

ui/widgets/dropdown_menu.cpp

@@ -12,7 +12,7 @@ namespace Ui {
 
 DropdownMenu::DropdownMenu(QWidget *parent, const style::DropdownMenu &st) : InnerDropdown(parent, st.wrap)
 , _st(st) {
-	_menu = setOwnedWidget(object_ptr<Menu>(this, _st.menu));
+	_menu = setOwnedWidget(object_ptr<Menu::Menu>(this, _st.menu));
 	init();
 }
 

ui/widgets/dropdown_menu.h

@@ -8,7 +8,7 @@
 
 #include "styles/style_widgets.h"
 #include "ui/widgets/inner_dropdown.h"
-#include "ui/widgets/menu.h"
+#include "ui/widgets/menu/menu.h"
 
 namespace Ui {
 
@@ -80,7 +80,7 @@ private:
 	const style::DropdownMenu &_st;
 	Fn<void()> _hiddenCallback;
 
-	QPointer<Menu> _menu;
+	QPointer<Menu::Menu> _menu;
 
 	// Not ready with submenus yet.
 	//using Submenus = QMap<QAction*, SubmenuPointer>;

ui/widgets/menu/menu.cpp

@@ -4,7 +4,7 @@
 // For license and copyright information please follow this link:
 // https://github.com/desktop-app/legal/blob/master/LEGAL
 //
-#include "ui/widgets/menu.h"
+#include "ui/widgets/menu/menu.h"
 
 #include "ui/widgets/buttons.h"
 #include "ui/widgets/checkbox.h"
@@ -14,7 +14,7 @@
 
 #include <QtGui/QtEvents>
 
-namespace Ui {
+namespace Ui::Menu {
 
 Menu::Menu(QWidget *parent, const style::Menu &st)
 : RpWidget(parent)
@@ -73,12 +73,12 @@ not_null<QAction*> Menu::addAction(not_null<QAction*> action, const style::icon
 		: _actionWidgets.back()->y() + _actionWidgets.back()->height();
 	const auto index = _actionWidgets.size();
 	if (action->isSeparator()) {
-		auto widget = base::make_unique_q<Ui::Separator>(this, _st, index);
+		auto widget = base::make_unique_q<Separator>(this, _st, index);
 		widget->moveToLeft(0, top);
 		widget->show();
 		_actionWidgets.push_back(std::move(widget));
 	} else {
-		auto widget = base::make_unique_q<Ui::Action>(
+		auto widget = base::make_unique_q<Action>(
 			this,
 			_st,
 			index,
@@ -336,4 +336,4 @@ void Menu::handleMouseRelease(QPoint globalPosition) {
 	}
 }
 
-} // namespace Ui
+} // namespace Ui::Menu

ui/widgets/menu/menu.h

@@ -13,7 +13,7 @@
 
 #include <QtWidgets/QMenu>
 
-namespace Ui {
+namespace Ui::Menu {
 
 class ItemBase;
 class ToggleView;
@@ -33,7 +33,6 @@ public:
 
 	void clearSelection();
 
-	using TriggeredSource = ContextMenu::TriggeredSource;
 	void setChildShown(bool shown) {
 		_childShown = shown;
 	}
@@ -110,4 +109,4 @@ private:
 
 };
 
-} // namespace Ui
+} // namespace Ui::Menu

ui/widgets/menu/menu_action.cpp

@@ -9,7 +9,7 @@
 #include "ui/effects/ripple_animation.h"
 #include "ui/painter.h"
 
-namespace Ui {
+namespace Ui::Menu {
 namespace {
 
 [[nodiscard]] TextWithEntities ParseMenuItem(const QString &text) {
@@ -195,11 +195,11 @@ QPoint Action::prepareRippleStartPosition() const {
 }
 
 QImage Action::prepareRippleMask() const {
-	return RippleAnimation::rectMask(size());
+	return Ui::RippleAnimation::rectMask(size());
 }
 
 int Action::contentHeight() const {
 	return _height;
 }
 
-} // namespace Ui
+} // namespace Ui::Menu

ui/widgets/menu/menu_action.h

@@ -12,7 +12,7 @@
 
 class Painter;
 
-namespace Ui {
+namespace Ui::Menu {
 
 class Action : public ItemBase {
 public:
@@ -50,4 +50,4 @@ private:
 
 };
 
-} // namespace Ui
+} // namespace Ui::Menu

ui/widgets/menu/menu_common.h

@@ -6,11 +6,11 @@
 //
 #pragma once
 
-namespace Ui::ContextMenu {
+namespace Ui::Menu {
 
 enum class TriggeredSource {
 	Mouse,
 	Keyboard,
 };
 
-} // namespace Ui::ContextMenu
+} // namespace Ui::Menu

ui/widgets/menu/menu_item_base.cpp

@@ -6,13 +6,7 @@
 //
 #include "ui/widgets/menu/menu_item_base.h"
 
-namespace Ui {
-
-namespace {
-
-using TriggeredSource = Menu::TriggeredSource;
-
-} // namespace
+namespace Ui::Menu {
 
 ItemBase::ItemBase(
 	not_null<RpWidget*> parent,
@@ -105,4 +99,4 @@ void ItemBase::setContentWidth(int w) {
 	_contentWidth = w;
 }
 
-} // namespace Ui
+} // namespace Ui::Menu

ui/widgets/menu/menu_item_base.h

@@ -7,17 +7,16 @@
 #pragma once
 
 #include "ui/widgets/buttons.h"
-#include "ui/widgets/menu.h"
+#include "ui/widgets/menu/menu.h"
 #include "ui/widgets/menu/menu_common.h"
 #include "styles/style_widgets.h"
 
-namespace Ui {
+namespace Ui::Menu {
 
 class ItemBase : public RippleButton {
 public:
 	ItemBase(not_null<RpWidget*> parent, const style::Menu &st, int index);
 
-	using TriggeredSource = ContextMenu::TriggeredSource;
 	TriggeredSource lastTriggeredSource() const;
 
 	rpl::producer<bool> selects() const;
@@ -62,4 +61,4 @@ private:
 
 };
 
-} // namespace Ui
+} // namespace Ui::Menu

ui/widgets/menu/menu_separator.cpp

@@ -8,7 +8,7 @@
 
 #include "ui/painter.h"
 
-namespace Ui {
+namespace Ui::Menu {
 
 Separator::Separator(
 	not_null<RpWidget*> parent,
@@ -48,4 +48,4 @@ int Separator::contentHeight() const {
 	return _height;
 }
 
-} // namespace Ui
+} // namespace Ui::Menu

ui/widgets/menu/menu_separator.h

@@ -11,7 +11,7 @@
 
 class Painter;
 
-namespace Ui {
+namespace Ui::Menu {
 
 class Separator : public ItemBase {
 public:
@@ -32,4 +32,4 @@ private:
 
 };
 
-} // namespace Ui
+} // namespace Ui::Menu

ui/widgets/popup_menu.h

@@ -7,7 +7,7 @@
 #pragma once
 
 #include "styles/style_widgets.h"
-#include "ui/widgets/menu.h"
+#include "ui/widgets/menu/menu.h"
 #include "ui/effects/animations.h"
 #include "ui/effects/panel_animation.h"
 #include "ui/round_rect.h"
@@ -99,7 +99,7 @@ private:
 	const style::PopupMenu &_st;
 
 	RoundRect _roundRect;
-	object_ptr<Menu> _menu;
+	object_ptr<Menu::Menu> _menu;
 
 	using Submenus = QMap<QAction*, SubmenuPointer>;
 	Submenus _submenus;