diff --git a/applets/appmenu/package/contents/ui/main.qml b/applets/appmenu/package/contents/ui/main.qml --- a/applets/appmenu/package/contents/ui/main.qml +++ b/applets/appmenu/package/contents/ui/main.qml @@ -104,7 +104,7 @@ Repeater { id: buttonRepeater - model: !appMenuModel.menuHidden ? appMenuModel : null + model: appMenuModel.visible ? appMenuModel : null PlasmaComponents.ToolButton { readonly property int buttonIndex: index diff --git a/applets/appmenu/plugin/appmenumodel.h b/applets/appmenu/plugin/appmenumodel.h --- a/applets/appmenu/plugin/appmenumodel.h +++ b/applets/appmenu/plugin/appmenumodel.h @@ -40,7 +40,7 @@ Q_OBJECT Q_PROPERTY(bool menuAvailable READ menuAvailable WRITE setMenuAvailable NOTIFY menuAvailableChanged) - Q_PROPERTY(bool menuHidden READ menuHidden NOTIFY menuHiddenChanged) + Q_PROPERTY(bool visible READ visible NOTIFY visibleChanged) Q_PROPERTY(QRect screenGeometry READ screenGeometry WRITE setScreenGeometry NOTIFY screenGeometryChanged) @@ -62,7 +62,7 @@ bool menuAvailable() const; void setMenuAvailable(bool set); - bool menuHidden() const; + bool visible() const; QRect screenGeometry() const; void setScreenGeometry(QRect geometry); @@ -76,19 +76,19 @@ private Q_SLOTS: void onActiveWindowChanged(WId id); void onWindowChanged(WId id); - void setMenuHidden(bool hide); + void setVisible(bool visible); void update(); signals: void menuAvailableChanged(); - void menuHiddenChanged(); void modelNeedsUpdate(); void screenGeometryChanged(); + void visibleChanged(); private: bool m_menuAvailable; - bool m_menuHidden = false; bool m_updatePending = false; + bool m_visible = true; QRect m_screenGeometry; diff --git a/applets/appmenu/plugin/appmenumodel.cpp b/applets/appmenu/plugin/appmenumodel.cpp --- a/applets/appmenu/plugin/appmenumodel.cpp +++ b/applets/appmenu/plugin/appmenumodel.cpp @@ -110,21 +110,21 @@ { if (m_menuAvailable != set) { m_menuAvailable = set; - setMenuHidden(false); + setVisible(true); emit menuAvailableChanged(); } } -bool AppMenuModel::menuHidden() const +bool AppMenuModel::visible() const { - return m_menuHidden; + return m_visible; } -void AppMenuModel::setMenuHidden(bool hide) +void AppMenuModel::setVisible(bool visible) { - if (m_menuHidden != hide) { - m_menuHidden = hide; - emit menuHiddenChanged(); + if (m_visible != visible) { + m_visible = visible; + emit visibleChanged(); } } @@ -232,14 +232,14 @@ // lok at transient windows first while (transientId) { if (updateMenuFromWindowIfHasMenu(transientId)) { - setMenuHidden(false); + setVisible(true); return; } transientId = KWindowInfo(transientId, nullptr, NET::WM2TransientFor).transientFor(); } if (updateMenuFromWindowIfHasMenu(id)) { - setMenuHidden(false); + setVisible(true); return; } @@ -262,7 +262,7 @@ KWindowInfo info(id, NET::WMState | NET::WMGeometry); const bool contained = m_screenGeometry.isNull() || m_screenGeometry.contains(info.geometry().center()); - setMenuHidden(info.isMinimized() || !contained); + setVisible(contained && !info.isMinimized()); } }