aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-07-12 12:43:15 -0400
committerKen Moore <ken@ixsystems.com>2017-07-12 12:43:44 -0400
commitc7a44d46d9186fc243f9b66ba28260d424f9b1cb (patch)
tree5fec79eb520f8cc272952807247d68e53e9d6dfd
parentFixed spacing error in UI file (diff)
downloadlumina-c7a44d46d9186fc243f9b66ba28260d424f9b1cb.tar.gz
lumina-c7a44d46d9186fc243f9b66ba28260d424f9b1cb.tar.bz2
lumina-c7a44d46d9186fc243f9b66ba28260d424f9b1cb.zip
Fix a few random issues with Lumina2.
-rw-r--r--src-qt5/core/libLumina/RootWindow.cpp1
-rw-r--r--src-qt5/core/lumina-desktop-unified/LSession.cpp4
-rw-r--r--src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h4
3 files changed, 5 insertions, 4 deletions
diff --git a/src-qt5/core/libLumina/RootWindow.cpp b/src-qt5/core/libLumina/RootWindow.cpp
index 2fee5d96..31faaf50 100644
--- a/src-qt5/core/libLumina/RootWindow.cpp
+++ b/src-qt5/core/libLumina/RootWindow.cpp
@@ -14,6 +14,7 @@
RootWindow::RootWindow() : QWidget(0, Qt::Window | Qt::BypassWindowManagerHint | Qt::WindowStaysOnBottomHint){
qRegisterMetaType<WId>("WId");
autoResizeTimer = 0;
+ this->setMouseTracking(true);
}
RootWindow::~RootWindow(){
diff --git a/src-qt5/core/lumina-desktop-unified/LSession.cpp b/src-qt5/core/lumina-desktop-unified/LSession.cpp
index df70b22e..0b9a9b35 100644
--- a/src-qt5/core/lumina-desktop-unified/LSession.cpp
+++ b/src-qt5/core/lumina-desktop-unified/LSession.cpp
@@ -11,7 +11,7 @@
#include "BootSplash.h"
#ifndef DEBUG
-#define DEBUG 1
+#define DEBUG 0
#endif
//Initialize all the global objects to null pointers
@@ -223,7 +223,7 @@ void LSession::setupGlobalConnections(){
connect(Lumina::SHORTCUTS, SIGNAL(StartLogout()), this, SLOT(StartLogout()) );
connect(Lumina::SHORTCUTS, SIGNAL(StartReboot()), this, SLOT(StartReboot()) );
connect(Lumina::SHORTCUTS, SIGNAL(StartShutdown()), this, SLOT(StartShutdown()) );
- connect(Lumina::SHORTCUTS, SIGNAL(LaunchApplication(QString), this, SLOT(LaunchApplication(QString)) );
+ connect(Lumina::SHORTCUTS, SIGNAL(LaunchApplication(QString)), this, SLOT(LaunchApplication(QString)) );
connect(Lumina::SHORTCUTS, SIGNAL(LaunchStandardApplication(QString)), this, SLOT(LaunchStandardApplication(QString)) );
connect(Lumina::SHORTCUTS, SIGNAL(LockSession()), Lumina::SS, SLOT(LockScreenNow()) );
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h
index 9e5d52dc..ad1b1122 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/Grav.h
@@ -136,7 +136,7 @@ private slots:
public:
GravAnimation(QWidget *parent, QSettings *set) : BaseAnimGroup(parent, set){}
~GravAnimation(){
- this->stop();
+ //this->stop();
}
void LoadAnimations(){
@@ -178,7 +178,7 @@ public:
connect(tmp, SIGNAL(finished()), this, SLOT(checkFinished()));
planets << tmp;
}
- while(planets.length()>number){planets.takeAt(number)->deleteLater(); sun->deleteLater(); }
+ while(planets.length()>number){planets.takeAt(number)->deleteLater(); }
}
};
bgstack15