From 5d8ae96a5694fa166eb86d34e80bca1bd6d37626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20L=C3=BCbking?= Date: Wed, 26 Mar 2014 18:06:03 +0100 Subject: [PATCH] take fullscreen windows out of tabbing it's not been possible to attach tabs to an (undecorated!) fullscreen window. now it's neither possible to attach a fullscreen window to another tabgroup and fullscreening a window will untab it CCBUG: 332568 Forward port of abf3d200cfc39fcc27a22224512853a96d947add from kde-workspace --- geometry.cpp | 4 +++- useractions.cpp | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/geometry.cpp b/geometry.cpp index b4d07ae506..35bbe51597 100644 --- a/geometry.cpp +++ b/geometry.cpp @@ -2400,8 +2400,10 @@ void Client::setFullScreen(bool set, bool user) fullscreen_mode = set ? FullScreenNormal : FullScreenNone; if (was_fs == isFullScreen()) return; - if (set) + if (set) { + untab(); workspace()->raiseClient(this); + } StackingUpdatesBlocker blocker1(workspace()); GeometryUpdatesBlocker blocker2(this); workspace()->updateClientLayer(this); // active fullscreens get different layer diff --git a/useractions.cpp b/useractions.cpp index 4a62887d6d..f79fe15700 100755 --- a/useractions.cpp +++ b/useractions.cpp @@ -549,6 +549,7 @@ void UserActionsMenu::initTabbingPopups() m_menu->insertMenu(m_removeFromTabGroup, m_addTabsMenu); } + m_addTabsMenu->menuAction()->setEnabled(!m_client.data()->isFullScreen()); m_removeFromTabGroup->setVisible(needTabManagers); m_closeTabGroup->setVisible(needTabManagers); }