aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-08-15 14:26:54 -0400
committerKen Moore <ken@ixsystems.com>2017-08-15 14:26:54 -0400
commit7331cfaf0a9af1b05a40755f61257579ce1b9731 (patch)
tree6b29d1dae70404f548b35e5d6bf9280b68486a9d /src-qt5/core
parentGet most of lumina-xconfig updated so screens can be moved around on a canvas... (diff)
downloadlumina-7331cfaf0a9af1b05a40755f61257579ce1b9731.tar.gz
lumina-7331cfaf0a9af1b05a40755f61257579ce1b9731.tar.bz2
lumina-7331cfaf0a9af1b05a40755f61257579ce1b9731.zip
Couple quick updates to LSession - not enabled at the moment.
Diffstat (limited to 'src-qt5/core')
-rw-r--r--src-qt5/core/lumina-desktop/LSession.cpp9
-rw-r--r--src-qt5/core/lumina-desktop/LSession.h1
2 files changed, 8 insertions, 2 deletions
diff --git a/src-qt5/core/lumina-desktop/LSession.cpp b/src-qt5/core/lumina-desktop/LSession.cpp
index 777affd1..a5785963 100644
--- a/src-qt5/core/lumina-desktop/LSession.cpp
+++ b/src-qt5/core/lumina-desktop/LSession.cpp
@@ -49,6 +49,7 @@ LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lu
lastActiveWin = 0;
cleansession = true;
TrayStopping = false;
+ xchange = false;
ICONS = new LIconCache(this);
screenTimer = new QTimer(this);
screenTimer->setSingleShot(true);
@@ -364,12 +365,14 @@ void LSession::screensChanged(){
qDebug() << "Screen Number Changed";
if(screenTimer->isActive()){ screenTimer->stop(); }
screenTimer->start();
+ xchange = true;
}
void LSession::screenResized(int scrn){
qDebug() << "Screen Resized:" << scrn;
if(screenTimer->isActive()){ screenTimer->stop(); }
screenTimer->start();
+ xchange = true;
}
void LSession::checkWindowGeoms(){
@@ -467,9 +470,10 @@ void LSession::updateDesktops(){
}
dset.setValue("last_used_screens", allNames);
//Make sure fluxbox also gets prompted to re-load screen config if the number of screens changes in the middle of a session
- if(numchange && !firstrun) {
+ if(!firstrun && xchange){
qDebug() << "Update WM";
- refreshWindowManager();
+ //QProcess::startDetached("killall fluxbox");
+ xchange = false;
}
//Make sure all the background windows are registered on the system as virtual roots
@@ -660,6 +664,7 @@ void LSession::playAudioFile(QString filepath){
void LSession::RootSizeChange(){
qDebug() << "Got Root Size Change";
if(DESKTOPS.isEmpty()){ return; } //Initial setup not run yet
+ xchange = true;
screenTimer->start();
}
diff --git a/src-qt5/core/lumina-desktop/LSession.h b/src-qt5/core/lumina-desktop/LSession.h
index 4c8da41c..0d69df84 100644
--- a/src-qt5/core/lumina-desktop/LSession.h
+++ b/src-qt5/core/lumina-desktop/LSession.h
@@ -109,6 +109,7 @@ private:
QList<LDesktop*> DESKTOPS;
QFileSystemWatcher *watcher;
QTimer *screenTimer;
+ bool xchange; //flag for when the x11 session was adjusted
//Internal variable for global usage
AppMenu *appmenu;
bgstack15