From 727929db8a8f35dc462df854f97fa084bb5f6117 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Tue, 13 Oct 2015 11:14:41 +0200 Subject: [PATCH] Use isDecorated() instead of m_decoration in Client::setQuickTileMode A preparation step to move the implementation to AbstractClient. --- geometry.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/geometry.cpp b/geometry.cpp index 31ac6fa9d6..6e396ec9c0 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -3271,7 +3271,7 @@ void Client::setQuickTileMode(QuickTileMode mode, bool keyboard) if (mode != QuickTileNone) { quick_tile_mode = mode; // decorations may turn off some borders when tiled - const ForceGeometry_t geom_mode = m_decoration ? ForceGeometrySet : NormalGeometrySet; + const ForceGeometry_t geom_mode = isDecorated() ? ForceGeometrySet : NormalGeometrySet; quick_tile_mode = QuickTileNone; // Temporary, so the maximize code doesn't get all confused setGeometry(electricBorderMaximizeGeometry(keyboard ? geometry().center() : Cursor::pos(), desktop()), geom_mode); } @@ -3336,7 +3336,7 @@ void Client::setQuickTileMode(QuickTileMode mode, bool keyboard) if (mode != QuickTileNone) { quick_tile_mode = mode; // decorations may turn off some borders when tiled - const ForceGeometry_t geom_mode = m_decoration ? ForceGeometrySet : NormalGeometrySet; + const ForceGeometry_t geom_mode = isDecorated() ? ForceGeometrySet : NormalGeometrySet; // Temporary, so the maximize code doesn't get all confused quick_tile_mode = QuickTileNone; setGeometry(electricBorderMaximizeGeometry(whichScreen, desktop()), geom_mode); @@ -3354,7 +3354,7 @@ void Client::setQuickTileMode(QuickTileMode mode, bool keyboard) if (!geom_restore.isValid()) // invalid if we started maximized and wait for placement geom_restore = geometry(); // decorations may turn off some borders when tiled - const ForceGeometry_t geom_mode = m_decoration ? ForceGeometrySet : NormalGeometrySet; + const ForceGeometry_t geom_mode = isDecorated() ? ForceGeometrySet : NormalGeometrySet; setGeometry(geom_restore, geom_mode); checkWorkspacePosition(); // Just in case it's a different screen }