From 232e19d0a9f69e28711edbfcb108d230f3d47f75 Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Mon, 6 Jul 2020 15:47:08 -0700
Subject: [PATCH] fix col/row grid on imported widgets

---
 res/HelloTwitter.qml          | 10 ++++------
 res/example.qml               | 19 ++++++++-----------
 src/widget_builders/import.rs |  2 +-
 3 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/res/HelloTwitter.qml b/res/HelloTwitter.qml
index 2ba276c..3772d31 100644
--- a/res/HelloTwitter.qml
+++ b/res/HelloTwitter.qml
@@ -2,28 +2,26 @@ Grid {
     rows:2
     cols:2
     Rectangle {
-        color: "blue"
+        color: "#F3F0F4"
         Text {
             anchors.centerIn: parent
             text: "Hello, Twitter! 🦀"
         }
     }
     Rectangle {
-        color: "red"
+        color: "#281038"
         border.color: "#550099"
         anchors.centerIn: parent
         Image {
-            id: opimg
             anchors.centerIn: parent
-            opacity: [[rand_opacity()]]
             source: "./res/openprivacy.png"
         }
     }
     Rectangle {
-        color: "red"
+        color: "#634B72"
     }
     Rectangle {
-        color: "blue"
+        color: "#281038"
         Text {
             anchors.centerIn: parent
             text: "Hello, Twitter! 🦀"
diff --git a/res/example.qml b/res/example.qml
index 9459707..1081e29 100644
--- a/res/example.qml
+++ b/res/example.qml
@@ -6,15 +6,12 @@ Grid {
 
     }
 
-    Rectangle {
-        color: "blue"
-        Text {
-            anchors.centerIn: parent
-            text: "Hello, World!"
-        }
+    HelloTwitter {
+
     }
+
     Rectangle {
-        color: "blue"
+        color: "#8c63a4"
         Text {
             id: target
             anchors.centerIn: parent
@@ -26,7 +23,7 @@ Grid {
         columns: 2
 
         Rectangle {
-            color: "red"
+            color: "#634B72"
             TextField {
                 id: tf1
                 anchors.centerIn: parent
@@ -36,7 +33,7 @@ Grid {
             }
         }
         Rectangle {
-            color: "blue"
+            color: "#6F4985"
             Button {
                 anchors.centerIn: parent
                 text: "Hello, World!"
@@ -47,7 +44,7 @@ Grid {
             }
         }
         Rectangle {
-            color: "blue"
+            color: "#F3F0F4"
             Button {
                 anchors.centerIn: parent
                 text: "Hello, World!"
@@ -58,7 +55,7 @@ Grid {
             }
         }
         Rectangle {
-            color: "red"
+            color: "#b29dbe"
             Text {
                 anchors.centerIn: parent
                 text: "Hello, World!"
diff --git a/src/widget_builders/import.rs b/src/widget_builders/import.rs
index 88d0159..de7a7c1 100644
--- a/src/widget_builders/import.rs
+++ b/src/widget_builders/import.rs
@@ -16,7 +16,7 @@ impl WidgetBuilder for ImportBuilder {
         return Box::new(move |id, ctx, row, col, qmlctx| -> Entity {
             let qml_doc = parse_qml(format!("./res/{}.qml", import_source).as_str());
             let top_level = qml_doc.children.clone();
-            QmlWidgetBuilder::new().build(id, 0, 0, top_level[0].0.clone(), top_level[0].1.clone(), ctx, qmlctx.borrow_mut())
+            QmlWidgetBuilder::new().build(id, row, col, top_level[0].0.clone(), top_level[0].1.clone(), ctx, qmlctx.borrow_mut())
         });
     }
 }