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

List:       kde-commits
Subject:    KDE/kdebase/workspace/plasma/netbook/containments/sal
From:       Aaron J. Seigo <aseigo () kde ! org>
Date:       2009-09-30 22:37:06
Message-ID: 1254350226.538521.14654.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1029859 by aseigo:

delay the initialization of the strip widget as that triggers the loading of runners \
and slows down initial startup


 M  +16 -5     sal.cpp  
 M  +4 -0      sal.h  


--- trunk/KDE/kdebase/workspace/plasma/netbook/containments/sal/sal.cpp \
#1029858:1029859 @@ -52,7 +52,7 @@
       m_searchField(0),
       m_gridScroll(0),
       m_appletsLayout(0),
-      m_buttonDownMousePos(QPoint())
+      m_stripUninitialized(true)
 {
     setContainmentType(Containment::CustomContainment);
     setFocusPolicy(Qt::StrongFocus);
@@ -311,7 +311,7 @@
             // create main layout
             m_mainLayout = new QGraphicsLinearLayout();
             m_mainLayout->setOrientation(layoutOtherDirection);
-            m_mainLayout->setContentsMargins(0, 10, 0, 0);
+            m_mainLayout->setContentsMargins(0, 0, 0, 0);
             m_mainLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,
                                                     QSizePolicy::Expanding));
             setLayout(m_mainLayout);
@@ -338,9 +338,6 @@
             gridLayout->addItem(m_gridScroll);
 
             m_stripWidget = new StripWidget(m_runnermg, this);
-            KConfigGroup cg = config();
-            m_stripWidget->restore(cg);
-
             m_appletsLayout = new QGraphicsLinearLayout();
 
             m_homeButton = new Plasma::IconWidget(this);
@@ -429,6 +426,20 @@
     }
 }
 
+void SearchLaunch::restoreStrip()
+{
+    KConfigGroup cg = config();
+    m_stripWidget->restore(cg);
+}
+
+void SearchLaunch::paintInterface(QPainter *, const QStyleOptionGraphicsItem *, \
const QRect &) +{
+    if (m_stripUninitialized) {
+        m_stripUninitialized = false;
+        QTimer::singleShot(100, this, SLOT(restoreStrip()));
+    }
+}
+
 void SearchLaunch::delayedQuery()
 {
     m_searchTimer->start(500);
--- trunk/KDE/kdebase/workspace/plasma/netbook/containments/sal/sal.h \
#1029858:1029859 @@ -55,6 +55,7 @@
 protected:
     bool eventFilter(QObject *watched, QEvent *event);
     void focusInEvent(QFocusEvent *event);
+    void paintInterface(QPainter *, const QStyleOptionGraphicsItem *, const QRect \
&);  
 public slots:
     void dataUpdated(const QString &sourceName, const Plasma::DataEngine::Data \
&data); @@ -63,6 +64,7 @@
     void updateSize();
     void layoutApplet(Plasma::Applet* applet, const QPointF &pos);
     void appletRemoved(Plasma::Applet* applet);
+    void restoreStrip();
 
     void doSearch(const QString query);
     void setQueryMatches(const QList<Plasma::QueryMatch> &m);
@@ -99,6 +101,8 @@
     QGraphicsLinearLayout *m_mainLayout;
     QGraphicsLinearLayout *m_appletsLayout;
     QPointF m_buttonDownMousePos;
+
+    bool m_stripUninitialized;
 };
 
 


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