alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

It is the sole user of isMultiHead so move the code there

Browse Source
This commit is contained in:
Kevin Ottens 2013-08-12 18:12:11 +02:00
parent 0978d2f73a
commit 72485975cb
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/shell/scripting/appinterface.cpp
View File

@ -35,6 +35,10 @@
#include <Plasma/PluginLoader> #include <Plasma/PluginLoader>
#include <Plasma/Theme> #include <Plasma/Theme>
#ifdef Q_OS_WIN
#include <windows.h>
#endif
#ifdef Q_WS_X11 #ifdef Q_WS_X11
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <fixx11h.h> #include <fixx11h.h>
@ -120,7 +124,15 @@ void AppInterface::setTheme(const QString &name)
bool AppInterface::multihead() const bool AppInterface::multihead() const
{ {
return KGlobalSettings::isMultiHead(); #ifdef Q_OS_WIN
return GetSystemMetrics(SM_CMONITORS) > 1;
#else
QByteArray multiHead = qgetenv("KDE_MULTIHEAD");
if (!multiHead.isEmpty()) {
return (multiHead.toLower() == "true");
}
return false;
#endif
} }
int AppInterface::multiheadScreen() const int AppInterface::multiheadScreen() const
@ -128,7 +140,7 @@ int AppInterface::multiheadScreen() const
int id = -1; int id = -1;
#ifdef Q_WS_X11 #ifdef Q_WS_X11
if (KGlobalSettings::isMultiHead()) { if (multihead()) {
// with multihead, we "lie" and say that screen 0 is the default screen, in fact, we pretend // with multihead, we "lie" and say that screen 0 is the default screen, in fact, we pretend
// we have only one screen at all // we have only one screen at all
Display *dpy = XOpenDisplay(NULL); Display *dpy = XOpenDisplay(NULL);