LoginWidget bindingloop fix

diff --git a/src/qmlui/Dialog.qml b/src/qmlui/Dialog.qml
index 1d4ccdd..3736d65 100644 (file)
--- a/src/qmlui/Dialog.qml
+++ b/src/qmlui/Dialog.qml
@@ -97,7 +97,7 @@ Item {
 
         id: dialog
         y: parent.height - height
-        height: contentArea.item.childrenRect.height + contentArea.anchors.topMargin + contentArea.anchors.bottomMargin
+        height: contentArea.height
         color: palette.window
         anchors.left: parent.left
         anchors.right: parent.right
@@ -106,7 +106,7 @@ Item {
 
         Loader {
             id: contentArea
-            anchors { left: parent.left; right: parent.right; top: parent.top.bottom; bottom: parent.bottom; margins: 10 }
+            anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
         }
     }
 }

diff --git a/src/qmlui/LoginWidget.qml b/src/qmlui/LoginWidget.qml
index a309dbb..e3a49ae 100644 (file)
--- a/src/qmlui/LoginWidget.qml
+++ b/src/qmlui/LoginWidget.qml
@@ -17,14 +17,10 @@ Dialog {
     }
 
     contentComponent: Component {
-        id: loginComponent
-
         Item {
+            height: 300
             Flickable {
-                width: parent.width
-                anchors { left: parent.left; right: parent.right; bottom: parent.bottom }
-                height: 300
-
+                anchors.fill: parent
                 contentWidth: Math.max(width, webView.width)
                 contentHeight: Math.max(height, webView.height)
                 boundsBehavior: Flickable.StopAtBounds
@@ -33,12 +29,11 @@ Dialog {
                 WebView {
                     id: webView
                     focus: true
-                    preferredWidth: parent.width
-                    preferredHeight: parent.height
+                    preferredWidth: parent.parent.width
+                    preferredHeight: parent.parent.height
                     url: facebookAuthenticator.url
 
                     onUrlChanged: {
-//                        console.log("URL CHANGED: ", url)
                         facebookAuthenticator.urlChanged(url)
                     }
                 }