aboutsummaryrefslogtreecommitdiff
path: root/lumina-desktop
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2015-06-12 08:33:51 -0400
committerKen Moore <ken@pcbsd.org>2015-06-12 08:33:51 -0400
commit7b489310d13b2c825b1f0df31f945f3b3299767d (patch)
tree8501afa59ee50c31898f1d67ee37ec2a221ee9b6 /lumina-desktop
parentOops, fix a typo where the accent color was still being used for the highligh... (diff)
downloadlumina-7b489310d13b2c825b1f0df31f945f3b3299767d.tar.gz
lumina-7b489310d13b2c825b1f0df31f945f3b3299767d.tar.bz2
lumina-7b489310d13b2c825b1f0df31f945f3b3299767d.zip
Add a QtQuick sample plugin and disable the new panel container for QtQuick pluins. It appears that there is a fundamental issue with embedding QML objects into a panel/window with the "always on top" flag set - it never finishes painting the QML object and prevents the rest of the panel from being updated as well.
Diffstat (limited to 'lumina-desktop')
-rw-r--r--lumina-desktop/LSession.cpp2
-rw-r--r--lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h1
-rw-r--r--lumina-desktop/lumina-desktop.pro2
-rw-r--r--lumina-desktop/panel-plugins/NewPP.h6
-rw-r--r--lumina-desktop/panel-plugins/quickcontainer/QuickPPlugin.h3
5 files changed, 7 insertions, 7 deletions
diff --git a/lumina-desktop/LSession.cpp b/lumina-desktop/LSession.cpp
index aeb3e624..d6b6e891 100644
--- a/lumina-desktop/LSession.cpp
+++ b/lumina-desktop/LSession.cpp
@@ -25,7 +25,7 @@
#include <X11/extensions/Xdamage.h>
#ifndef DEBUG
-#define DEBUG 1
+#define DEBUG 0
#endif
XCBEventFilter *evFilter = 0;
diff --git a/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h b/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h
index a59ed87f..2bde5d54 100644
--- a/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h
+++ b/lumina-desktop/desktop-plugins/quickcontainer/QuickDPlugin.h
@@ -22,6 +22,7 @@ public:
this->setLayout( new QVBoxLayout());
this->layout()->setContentsMargins(0,0,0,0);
container = new QQuickWidget(this);
+ container->setResizeMode(QQuickWidget::SizeRootObjectToView);
this->layout()->addWidget(container);
container->setSource(QUrl::fromLocalFile( LUtils::findQuickPluginFile(ID.section("---",0,0)) ));
}
diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro
index c8203533..c6e67e00 100644
--- a/lumina-desktop/lumina-desktop.pro
+++ b/lumina-desktop/lumina-desktop.pro
@@ -94,7 +94,7 @@ HEADERS += Globals.h \
panel-plugins/showdesktop/LHomeButton.h \
panel-plugins/appmenu/LAppMenuPlugin.h \
panel-plugins/applauncher/AppLaunchButton.h \
- panel-plugins/quickcontainer/QuickPPlugin.h \
+# panel-plugins/quickcontainer/QuickPPlugin.h \
desktop-plugins/SamplePlugin.h \
desktop-plugins/calendar/CalendarPlugin.h \
desktop-plugins/applauncher/AppLauncherPlugin.h \
diff --git a/lumina-desktop/panel-plugins/NewPP.h b/lumina-desktop/panel-plugins/NewPP.h
index 78b942d0..2a061a23 100644
--- a/lumina-desktop/panel-plugins/NewPP.h
+++ b/lumina-desktop/panel-plugins/NewPP.h
@@ -24,7 +24,7 @@
#include "showdesktop/LHomeButton.h"
#include "appmenu/LAppMenuPlugin.h"
#include "applauncher/AppLaunchButton.h"
-#include "quickcontainer/QuickPPlugin.h"
+//#include "quickcontainer/QuickPPlugin.h"
#include "systemtray/LSysTray.h" //must be last due to X11 compile issues
class NewPP{
@@ -56,8 +56,8 @@ public:
plug = new LAppMenuPlugin(parent, plugin, horizontal);
}else if(plugin.section("---",0,0).section("::",0,0)=="applauncher"){
plug = new AppLaunchButtonPlugin(parent, plugin, horizontal);
- }else if( plugin.section("---",0,0).startsWith("quick-") && LUtils::validQuickPlugin(plugin.section("---",0,0)) ){
- plug = new QuickPPlugin(parent, plugin, horizontal);
+ //}else if( plugin.section("---",0,0).startsWith("quick-") && LUtils::validQuickPlugin(plugin.section("---",0,0)) ){
+ //plug = new QuickPPlugin(parent, plugin, horizontal);
}else{
qWarning() << "Invalid Panel Plugin:"<<plugin << " -- Ignored";
}
diff --git a/lumina-desktop/panel-plugins/quickcontainer/QuickPPlugin.h b/lumina-desktop/panel-plugins/quickcontainer/QuickPPlugin.h
index 7c887803..e160c2b3 100644
--- a/lumina-desktop/panel-plugins/quickcontainer/QuickPPlugin.h
+++ b/lumina-desktop/panel-plugins/quickcontainer/QuickPPlugin.h
@@ -20,9 +20,8 @@ class QuickPPlugin : public LPPlugin{
Q_OBJECT
public:
QuickPPlugin(QWidget* parent, QString ID, bool horizontal) : LPPlugin(parent, ID){
- this->setLayout( new QVBoxLayout());
- this->layout()->setContentsMargins(0,0,0,0);
container = new QQuickWidget(this);
+ container->setResizeMode(QQuickWidget::SizeRootObjectToView);
this->layout()->addWidget(container);
horizontal = true; //just to silence compiler warning
container->setSource(QUrl::fromLocalFile( LUtils::findQuickPluginFile(ID.section("---",0,0)) ));
bgstack15