From c918f40a773ca4ab20dc07ca895963835d594381 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Fri, 23 Aug 2013 18:42:37 +0200 Subject: [PATCH] Introduce a convenience method isMaximized in KDecoration Returns true in case of fully maximized, false otherwise. By that it ignores the horizontal and vertical modes. --- clients/aurorae/src/aurorae.cpp | 5 ----- clients/aurorae/src/aurorae.h | 1 - libkdecorations/kdecoration.cpp | 5 +++++ libkdecorations/kdecoration.h | 10 ++++++++++ 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/clients/aurorae/src/aurorae.cpp b/clients/aurorae/src/aurorae.cpp index dc9d3c4dae..fbe18a41f8 100644 --- a/clients/aurorae/src/aurorae.cpp +++ b/clients/aurorae/src/aurorae.cpp @@ -437,11 +437,6 @@ void AuroraeClient::toggleKeepBelow() setKeepBelow(!keepBelow()); } -bool AuroraeClient::isMaximized() const -{ - return maximizeMode()==KDecorationDefines::MaximizeFull; -} - void AuroraeClient::titlePressed(int button, int buttons) { titlePressed(static_cast(button), static_cast(buttons)); diff --git a/clients/aurorae/src/aurorae.h b/clients/aurorae/src/aurorae.h index c39febea96..6591c6eab8 100644 --- a/clients/aurorae/src/aurorae.h +++ b/clients/aurorae/src/aurorae.h @@ -120,7 +120,6 @@ public: virtual void resize(const QSize& s); // optional overrides virtual void padding(int &left, int &right, int &top, int &bottom) const; - bool isMaximized() const; int doubleClickInterval() const; bool animationsSupported() const; diff --git a/libkdecorations/kdecoration.cpp b/libkdecorations/kdecoration.cpp index c15b2c3c48..4d2eddd75c 100644 --- a/libkdecorations/kdecoration.cpp +++ b/libkdecorations/kdecoration.cpp @@ -133,6 +133,11 @@ KDecoration::MaximizeMode KDecoration::maximizeMode() const return bridge_->maximizeMode(); } +bool KDecoration::isMaximized() const +{ + return maximizeMode() == MaximizeFull; +} + KDecoration::QuickTileMode KDecoration::quickTileMode() const { return bridge_->quickTileMode(); diff --git a/libkdecorations/kdecoration.h b/libkdecorations/kdecoration.h index 524871a6d4..4a43999023 100644 --- a/libkdecorations/kdecoration.h +++ b/libkdecorations/kdecoration.h @@ -531,8 +531,18 @@ public: * Returns the current maximization mode of the decorated window. * Note that only fully maximized windows should be treated * as "maximized" (e.g. if the maximize button has only two states). + * @see isMaximized */ MaximizeMode maximizeMode() const; + /** + * @brief Convenience method for the case that the decoration is + * only interested in whether the decoration is in fully maximized + * or restored state ignoring vertical and horizontal maximized modes. + * + * @return bool @c true if maximized fully, @c false otherwise + * @see maximizeMode + */ + bool isMaximized() const; /** * Returns @a true if the decorated window can be minimized by the user. */