[patch] this one should apply clearly

lancelot-qt45.patch (text/plain), 2.71 KB, created by Robert Piasek (RETIRED) on 2009-02-14 21:27:31 UTC

--- applets/lancelot/libs/lancelot/Global.cpp~	2008-12-21 20:20:19.000000000 +0000
+++ applets/lancelot/libs/lancelot/Global.cpp	2009-02-14 20:57:06.000000000 +0000
@@ -326,8 +326,11 @@
 
     d->confMain = new KConfig("lancelot" + app + "rc");
 
+    Plasma::Theme::defaultTheme()->setUseGlobalSettings(true);
+    qDebug() << "What is the plasma theme: " << Plasma::Theme::defaultTheme()->themeName();
     QString search = "desktoptheme/" + Plasma::Theme::defaultTheme()->themeName() + "/lancelot/" + app + "theme.config";
     kDebug() << search;
+    qDebug() << "Trying:" << search;
 
     QString path =  KStandardDirs::locate( "data", search );
     if (path == "") {
@@ -338,6 +341,8 @@
         path = "lancelotrc";
     }
     kDebug() << path;
+    
+    qDebug() << "Using theme:" << path;
     d->confTheme = new KConfig(path);
 
     Instance::Private::activeInstance = this;
--- applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp~	2009-01-06 17:23:55.000000000 +0000
+++ applets/lancelot/libs/lancelot/widgets/PassagewayView.cpp	2009-02-14 21:18:19.000000000 +0000
@@ -20,6 +20,11 @@
 #include "PassagewayView.h"
 
 #include <QWidget>
+#include <QGraphicsSceneMouseEvent>
+#include <QGraphicsView>
+#include <QApplication>
+#include <climits>
+
 
 namespace Lancelot {
 
@@ -65,6 +70,8 @@
       : layout(NULL), buttonsLayout(NULL), listsLayout(NULL), parent(p), focusIndex(0)
     {
         parent->setLayout(layout = new NodeLayout());
+        layout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
+        layout->setMaximumSize(INT_MAX, INT_MAX);        
 
         layout->addItem(
             buttonsLayout = new QGraphicsLinearLayout(Qt::Horizontal),
@@ -72,6 +79,9 @@
             NodeLayout::NodeCoordinate(1, 0, 0, 32)
         );
 
+        buttonsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
+        buttonsLayout->setMaximumSize(INT_MAX, INT_MAX);
+        
         ExtenderButton * spacer =
             new ExtenderButton(parent);
         spacer->setGroupByName("PassagewayView-Spacer");
@@ -88,6 +98,9 @@
 
         listsLayout->setSizer(new PassagewayViewSizer());
 
+        listsLayout->setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Expanding));
+        listsLayout->setMaximumSize(INT_MAX, INT_MAX);        
+
         buttonsLayout->setSpacing(0.0);
 
         next(Step("", QIcon(), entranceModel));
@@ -161,7 +174,10 @@
             path.takeLast();
 
             buttonsLayout->removeItem(button);
-            layout->activate();
+
+            // This really shouldn't be needed :(
+            buttonsLayout->setGeometry(buttonsLayout->geometry());
+            
             listsLayout->pop();
 
             button->deleteLater();