diff --git a/CMakeLists.txt b/CMakeLists.txt index 435774b..0068c4c 100644 --- a/CMakeLists.txt +++ b/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 diff --git a/ui/widgets/dropdown_menu.cpp b/ui/widgets/dropdown_menu.cpp index c293ebc..5380f4a 100644 --- a/ui/widgets/dropdown_menu.cpp +++ b/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(this, _st.menu)); + _menu = setOwnedWidget(object_ptr(this, _st.menu)); init(); } diff --git a/ui/widgets/dropdown_menu.h b/ui/widgets/dropdown_menu.h index abfbc03..1c283ff 100644 --- a/ui/widgets/dropdown_menu.h +++ b/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 _hiddenCallback; - QPointer _menu; + QPointer _menu; // Not ready with submenus yet. //using Submenus = QMap; diff --git a/ui/widgets/menu.cpp b/ui/widgets/menu/menu.cpp similarity index 97% rename from ui/widgets/menu.cpp rename to ui/widgets/menu/menu.cpp index 591e74e..bf76367 100644 --- a/ui/widgets/menu.cpp +++ b/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 -namespace Ui { +namespace Ui::Menu { Menu::Menu(QWidget *parent, const style::Menu &st) : RpWidget(parent) @@ -73,12 +73,12 @@ not_null Menu::addAction(not_null action, const style::icon : _actionWidgets.back()->y() + _actionWidgets.back()->height(); const auto index = _actionWidgets.size(); if (action->isSeparator()) { - auto widget = base::make_unique_q(this, _st, index); + auto widget = base::make_unique_q(this, _st, index); widget->moveToLeft(0, top); widget->show(); _actionWidgets.push_back(std::move(widget)); } else { - auto widget = base::make_unique_q( + auto widget = base::make_unique_q( this, _st, index, @@ -336,4 +336,4 @@ void Menu::handleMouseRelease(QPoint globalPosition) { } } -} // namespace Ui +} // namespace Ui::Menu diff --git a/ui/widgets/menu.h b/ui/widgets/menu/menu.h similarity index 97% rename from ui/widgets/menu.h rename to ui/widgets/menu/menu.h index 2bbc5f1..c7aea23 100644 --- a/ui/widgets/menu.h +++ b/ui/widgets/menu/menu.h @@ -13,7 +13,7 @@ #include -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 diff --git a/ui/widgets/menu/menu_action.cpp b/ui/widgets/menu/menu_action.cpp index 1323e19..3422c55 100644 --- a/ui/widgets/menu/menu_action.cpp +++ b/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 diff --git a/ui/widgets/menu/menu_action.h b/ui/widgets/menu/menu_action.h index d2aa1cd..8714ac7 100644 --- a/ui/widgets/menu/menu_action.h +++ b/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 diff --git a/ui/widgets/menu/menu_common.h b/ui/widgets/menu/menu_common.h index 09cb823..ebebfe7 100644 --- a/ui/widgets/menu/menu_common.h +++ b/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 diff --git a/ui/widgets/menu/menu_item_base.cpp b/ui/widgets/menu/menu_item_base.cpp index d17226b..7f09b95 100644 --- a/ui/widgets/menu/menu_item_base.cpp +++ b/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 parent, @@ -105,4 +99,4 @@ void ItemBase::setContentWidth(int w) { _contentWidth = w; } -} // namespace Ui +} // namespace Ui::Menu diff --git a/ui/widgets/menu/menu_item_base.h b/ui/widgets/menu/menu_item_base.h index 3d76d6f..e470bc0 100644 --- a/ui/widgets/menu/menu_item_base.h +++ b/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 parent, const style::Menu &st, int index); - using TriggeredSource = ContextMenu::TriggeredSource; TriggeredSource lastTriggeredSource() const; rpl::producer selects() const; @@ -62,4 +61,4 @@ private: }; -} // namespace Ui +} // namespace Ui::Menu diff --git a/ui/widgets/menu/menu_separator.cpp b/ui/widgets/menu/menu_separator.cpp index c00b96d..bdd7f16 100644 --- a/ui/widgets/menu/menu_separator.cpp +++ b/ui/widgets/menu/menu_separator.cpp @@ -8,7 +8,7 @@ #include "ui/painter.h" -namespace Ui { +namespace Ui::Menu { Separator::Separator( not_null parent, @@ -48,4 +48,4 @@ int Separator::contentHeight() const { return _height; } -} // namespace Ui +} // namespace Ui::Menu diff --git a/ui/widgets/menu/menu_separator.h b/ui/widgets/menu/menu_separator.h index e2bae7f..024131a 100644 --- a/ui/widgets/menu/menu_separator.h +++ b/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 diff --git a/ui/widgets/popup_menu.h b/ui/widgets/popup_menu.h index 1a8e9f3..304a9ec 100644 --- a/ui/widgets/popup_menu.h +++ b/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; + object_ptr _menu; using Submenus = QMap; Submenus _submenus;