diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 20:21:27 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2009-12-11 20:21:27 +0000 |
| commit | 10e41144596fc9ced40fc349d9ecd099b1c2ea19 (patch) | |
| tree | 88ab04e475ff5a4cd889cb082f5760b6e0bf5e4e /kicker/taskbar | |
| parent | 4aed2c8219774f5d797760606b8489a92ddc5163 (diff) | |
| download | tdebase-10e41144596fc9ced40fc349d9ecd099b1c2ea19.tar.gz tdebase-10e41144596fc9ced40fc349d9ecd099b1c2ea19.zip | |
Initial import of Trinity 3.5.11 to kdebase
Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes
Will need to check for commit warnings and repair as encountered
Also needs full compile test
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kicker/taskbar')
| -rw-r--r-- | kicker/taskbar/taskbar.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kicker/taskbar/taskbar.cpp b/kicker/taskbar/taskbar.cpp index 8c5bb73c1..c2580f5f1 100644 --- a/kicker/taskbar/taskbar.cpp +++ b/kicker/taskbar/taskbar.cpp @@ -241,9 +241,9 @@ void TaskBar::configure() m_showOnlyIconified = TaskBarSettings::showOnlyIconified(); m_currentScreen = -1; // Show all screens or re-get our screen - m_showOnlyCurrentScreen = TaskBarSettings::showCurrentScreenOnly() && + m_showOnlyCurrentScreen = (TaskBarSettings::showCurrentScreenOnly() && QApplication::desktop()->isVirtualDesktop() && - QApplication::desktop()->numScreens() > 1; + QApplication::desktop()->numScreens() > 1) || (QApplication::desktop()->numScreens() < 2); // we need to watch geometry issues if we aren't showing windows when we // are paying attention to the current Xinerama screen |