Merge remote-tracking branch 'origin/master'

1 files changed, 29 insertions, 6 deletions

diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/Panel.qml b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/Panel.qml
index 846b5b55..65c8a0eb 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/Panel.qml
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/Panel.qml
@@ -7,20 +7,43 @@
 import QtQuick 2.2
 import QtQuick.Window 2.2
 import QtQuick.Controls 1
+import QtQuick.Layouts 1.3
 
 import Lumina.Backend.PanelObject 2.0
 
-AnimatedImage {
+Rectangle {
     //C++ backend object
-    property string screen_id
+    property string panel_id
     property PanelObject object
 
+    id: panel
     //Normal geometries/placements
-    asynchronous: true
-    clip: true
-    source: object.background
+    color: object.background
     x: object.x
     y: object.y
     width: object.width
     height: object.height
-  }
+
+    GridLayout{
+	id: layout
+	anchors.fill: parent
+	//columns: parent.object.isVertical ? 1 : -1
+	//rows: parent.object.isVertical ? -1 : 1
+	flow: parent.isVertical ? GridLayout.TopToBottom : GridLayout.LeftToRight
+	//horizontalItemAlignment: parent.object.isVertical ? Grid.AlignHCenter : Qt.AlignLeft
+	//verticalItemAlignment: parent.object.isVertical ? Grid.AlignTop : Qt.AlignVCenter
+	Repeater { 
+		model: panel.object.plugins
+		Loader{
+			asynchronous: true
+			property bool vertical : layout.parent.object.isVertical
+			property bool isspacer : modelData.endsWith("/Spacer.qml");
+			source: modelData
+			Layout.fillWidth : (vertical || isspacer) ? true : false
+			Layout.fillHeight : (vertical && ! isspacer) ? false : true
+			Layout.alignment : Qt.AlignVCenter | Qt.AlignHCenter
+		}
+
+	}
+    } //end of grid layout
+}