[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/plasma
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2008-06-30 22:07:50
Message-ID: 1214863670.029625.21537.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 826537 by aseigo:

don't make panelcontroller a Popup anymore; it essentially works the same except that \
now you can click on things in the panel and it doesn't go away. kinda useful for \
dragging things in the panel ;)


 M  +13 -4     panelcontroller.cpp  
 M  +1 -0      panelcontroller.h  
 M  +1 -4      panelview.cpp  


--- trunk/KDE/kdebase/workspace/plasma/plasma/panelcontroller.cpp #826536:826537
@@ -30,10 +30,11 @@
 
 #include <KColorUtils>
 #include <KIcon>
+#include <KWindowSystem>
 
+#include <plasma/containment.h>
 #include <plasma/corona.h>
 #include <plasma/theme.h>
-#include <plasma/containment.h>
 
 #include "plasmaapp.h"
 #include "positioningruler.h"
@@ -312,12 +313,14 @@
 };
 
 PanelController::PanelController(QWidget* parent)
-   : QWidget(parent),
+   : QWidget(0),
      d(new Private(this))
 {
-    setWindowFlags(Qt::Popup);
+    //setWindowFlags(Qt::Popup);
+    setWindowFlags(Qt::FramelessWindowHint);
+    KWindowSystem::setState(winId(), NET::SkipTaskbar | NET::SkipPager | \
NET::Sticky);  setAttribute(Qt::WA_DeleteOnClose);
-
+    setFocus(Qt::ActiveWindowFocusReason);
     //Resize handles
     d->panelHeightHandle = new ResizeHandle(this);
 
@@ -764,4 +767,10 @@
     }
 }
 
+void PanelController::focusOutEvent(QFocusEvent * event)
+{
+    Q_UNUSED(event)
+    close();
+}
+
 #include "panelcontroller.moc"
--- trunk/KDE/kdebase/workspace/plasma/plasma/panelcontroller.h #826536:826537
@@ -61,6 +61,7 @@
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
+    void focusOutEvent(QFocusEvent * event);
 
 Q_SIGNALS:
     /**
--- trunk/KDE/kdebase/workspace/plasma/plasma/panelview.cpp #826536:826537
@@ -501,8 +501,6 @@
         m_panelController->setAlignment(m_alignment);
         m_panelController->setOffset(m_offset);
 
-        //connect(m_panelController, SIGNAL(showAddWidgets()), this, \
                SLOT(showAppletBrowser()));
-
         connect(m_panelController, SIGNAL(destroyed(QObject*)), this, \
                SLOT(edittingComplete()));
         connect(m_panelController, SIGNAL(offsetChanged(int)), this, \
                SLOT(setOffset(int)));
         connect(m_panelController, SIGNAL(alignmentChanged(Qt::Alignment)), this, \
SLOT(setAlignment(Qt::Alignment))); @@ -526,9 +524,8 @@
         m_panelController->move(m_panelController->positionForPanelGeometry(geometry()));
  m_panelController->show();
     } else {
-        m_panelController->hide();
+        m_panelController->close();
     }
-    repaint();
 }
 
 void PanelView::edittingComplete()


[prev in list] [next in list] [prev in thread] [next in thread]