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

List:       kde-commits
Subject:    KDE/kdeplasma-addons/applets/kimpanel/src
From:       Marco Martin <notmart () gmail ! com>
Date:       2010-06-07 20:09:41
Message-ID: 20100607200941.AA7B9AC8CE () svn ! kde ! org
[Download RAW message or body]

SVN commit 1135635 by mart:

never ever use your own scene in plasma


 M  +5 -4      kimlookuptable.cpp  
 M  +3 -2      kimlookuptable.h  
 M  +1 -1      kimpanelapplet.cpp  


--- trunk/KDE/kdeplasma-addons/applets/kimpanel/src/kimlookuptable.cpp #1135634:1135635
@@ -44,9 +44,10 @@
 #include <X11/Xlib.h>
 #endif
 
-KIMLookupTable::KIMLookupTable(PanelAgent *agent, QWidget *parent)
+KIMLookupTable::KIMLookupTable(PanelAgent *agent, Plasma::Corona *corona, QWidget *parent)
     :QWidget(parent),
-     m_visible(false)
+     m_visible(false),
+     m_scene(corona)
 {
     m_panel_agent = agent;
 
@@ -86,7 +87,8 @@
     KWindowSystem::setState( winId(), NET::SkipTaskbar | NET::SkipPager | NET::StaysOnTop);
     KWindowSystem::setType( winId(), NET::Dock);
 
-    m_scene = new QGraphicsScene(this);
+    m_widget = new KIMLookupTableGraphics(m_panel_agent);
+    m_scene->addOffscreenWidget(m_widget);
 
     m_view = new QGraphicsView(m_scene,this);
 
@@ -98,7 +100,6 @@
 
     m_layout->addWidget(m_view);
 
-    m_widget = new KIMLookupTableGraphics(m_panel_agent);
     connect(m_widget,SIGNAL(sizeChanged()),
             this,SLOT(propagateSizeChange()));
     connect(m_widget,SIGNAL(visibleChanged(bool)),
--- trunk/KDE/kdeplasma-addons/applets/kimpanel/src/kimlookuptable.h #1135634:1135635
@@ -23,6 +23,7 @@
 #include <plasma/theme.h>
 #include <plasma/svg.h>
 #include <plasma/framesvg.h>
+#include <Plasma/Corona>
 
 #include <QWidget>
 #include <QHBoxLayout>
@@ -42,7 +43,7 @@
 {
 Q_OBJECT
 public:
-    explicit KIMLookupTable(PanelAgent *agent = 0,QWidget *parent=0);
+    explicit KIMLookupTable(PanelAgent *agent = 0, Plasma::Corona *corona=0, QWidget *parent=0);
     ~KIMLookupTable();
     
 Q_SIGNALS:
@@ -68,7 +69,7 @@
     bool m_dragging;
     QPoint m_init_pos;
 
-    QGraphicsScene *m_scene;
+    Plasma::Corona *m_scene;
     QGraphicsView *m_view;
     KIMLookupTableGraphics *m_widget;
 
--- trunk/KDE/kdeplasma-addons/applets/kimpanel/src/kimpanelapplet.cpp #1135634:1135635
@@ -108,7 +108,7 @@
     connect(m_statusbarGraphics,SIGNAL(iconCountChanged()),SLOT(adjustSelf()));
     connect(m_statusbarGraphics,SIGNAL(collapsed(bool)),SLOT(toggleCollapse(bool)));
 
-    m_lookup_table = new KIMLookupTable(m_panel_agent);
+    m_lookup_table = new KIMLookupTable(m_panel_agent, static_cast<Plasma::Corona *>(scene()));
 
     m_logoIcon = new Plasma::IconWidget(KIcon("draw-freehand"),"",this);
     m_logoIcon->hide();
[prev in list] [next in list] [prev in thread] [next in thread]