Merge branch 'master' of github.com:pcbsd/lumina

4 files changed, 8 insertions, 5 deletions

diff --git a/lumina-desktop/LPanel.cpp b/lumina-desktop/LPanel.cpp
index 1f59ba8b..d5be8670 100644
--- a/lumina-desktop/LPanel.cpp
+++ b/lumina-desktop/LPanel.cpp
@@ -12,6 +12,7 @@
 
 LPanel::LPanel(QSettings *file, int scr, int num, QWidget *parent) : QWidget(){
   //Take care of inputs
+  this->setMouseTracking(true);
   if(DEBUG){ qDebug() << " - Creating Panel:" << scr << num; }
   bgWindow = parent; //save for later
   //Setup the widget overlay for the entire panel to provide transparency effects
@@ -283,6 +284,7 @@ void LPanel::enterEvent(QEvent *event){
     //Move the panel out so it is fully available
     this->move(showpoint);
   }
+  this->activateWindow();
   event->accept(); //just to quiet the compile warning
 }
 
diff --git a/lumina-desktop/WMProcess.cpp b/lumina-desktop/WMProcess.cpp
index 41cfb2bd..e84e4c22 100644
--- a/lumina-desktop/WMProcess.cpp
+++ b/lumina-desktop/WMProcess.cpp
@@ -85,7 +85,7 @@ QString WMProcess::setupWM(){
     if(!QFile::exists(QDir::homePath()+"/.fluxbox")){
       QDir dir; dir.mkpath(QDir::homePath()+"/.fluxbox");
     }
-    cmd = "fluxbox -rc "+confDir+"/fluxbox-init";
+    cmd = "fluxbox -rc "+confDir+"/fluxbox-init -no-slit -no-toolbar";
   }else {
     cmd = WM;
   }
diff --git a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
index 20607c60..eda1f2cd 100644
--- a/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
+++ b/lumina-desktop/panel-plugins/taskmanager/LTaskButton.cpp
@@ -193,9 +193,9 @@ void LTaskButton::minimizeWindow(){
 void LTaskButton::triggerWindow(){
   LWinInfo win = currentWindow();
   //Check which state the window is currently in and flip it to the other
-  LXCB::WINDOWSTATE state = cstate;
-  if(DEBUG){ qDebug() << "Window State: " << state; }
-  if(state == LXCB::ACTIVE){
+  //LXCB::WINDOWSTATE state = cstate;
+  //if(DEBUG){ qDebug() << "Window State: " << state; }
+  if(cstate == LXCB::ACTIVE){
     if(DEBUG){ qDebug() << "Minimize Window:" << this->text(); }
     LSession::handle()->XCB->MinimizeWindow(win.windowID());
     QTimer::singleShot(100, this, SLOT(UpdateButton()) ); //make sure to update this button if losing active status
diff --git a/lumina-desktop/panel-plugins/taskmanager/LTaskManagerPlugin.cpp b/lumina-desktop/panel-plugins/taskmanager/LTaskManagerPlugin.cpp
index 8f73ffa1..9da86da8 100644
--- a/lumina-desktop/panel-plugins/taskmanager/LTaskManagerPlugin.cpp
+++ b/lumina-desktop/panel-plugins/taskmanager/LTaskManagerPlugin.cpp
@@ -35,7 +35,8 @@ void LTaskManagerPlugin::UpdateButtons(){
   //Get the current window list
   QList<WId> winlist = LSession::handle()->XCB->WindowList();
   //Do not change the status of the previously active window if it just changed to a non-visible window
-  bool skipActive = false;//!winlist.contains( LSession::handle()->XCB->ActiveWindow() );
+  WId activeWin = LSession::handle()->XCB->ActiveWindow();
+  bool skipActive = !winlist.contains(activeWin);
   //qDebug() << "Update Buttons:" << winlist;
   if(updating > ctime){ return; } //another thread kicked off already - stop this one
   //Now go through all the current buttons first