From 8745bd99135ec72a3959f2587b6c901538810f23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Gr=C3=A4=C3=9Flin?= Date: Sat, 19 Dec 2009 13:23:53 +0000 Subject: [PATCH] Extend the kconf update for 4.4 so that desktop switch on screen edge does not get disabled by quick maximize/tiling. Changing the id, so that the script gets executed for those who already run it (tabbox settings will not be changed when the script runs once, so it's safe). BUG: 217770 svn path=/trunk/KDE/kdebase/workspace/; revision=1063869 --- data/kwin_update_tabbox_settings.upd | 2 +- data/update_tabbox_settings.cpp | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/data/kwin_update_tabbox_settings.upd b/data/kwin_update_tabbox_settings.upd index 95420a4d97..11957fab9b 100644 --- a/data/kwin_update_tabbox_settings.upd +++ b/data/kwin_update_tabbox_settings.upd @@ -1,2 +1,2 @@ -Id=Kwin-Tabbox +Id=Kwin-4.4 Script=kwin_update_tabbox_settings diff --git a/data/update_tabbox_settings.cpp b/data/update_tabbox_settings.cpp index 87a76a4c22..d43e835daf 100644 --- a/data/update_tabbox_settings.cpp +++ b/data/update_tabbox_settings.cpp @@ -45,6 +45,15 @@ int main( int argc, char* argv[] ) if( !tabbox.hasKey("ShowTabBox") ) tabbox.writeEntry("ShowTabBox", (style.compare("KDE", Qt::CaseInsensitive) == 0)?true:false); tabbox.sync(); + // screen edges - disable quick tiling when switch on desktop edge is activated + KConfigGroup borders(&config, "ElectricBorders"); + if( borders.readEntry("ElectricBorders", 0) >= 1 && + !borders.hasKey("ElectricBorderMaximize") && !borders.hasKey("ElectricBorderTiling") ) + { + borders.writeEntry("ElectricBorderMaximize", false); + borders.writeEntry("ElectricBorderTiling", false); + } + borders.sync(); config.sync(); // Send signal to all kwin instances QDBusMessage message =