Browser work

interface/resources/qml/Browser.qml

@@ -2,29 +2,121 @@ import QtQuick 2.3
 import QtQuick.Controls 1.2
 import QtWebKit 3.0
 import "controls"
+import "styles"
 
 Dialog {
-    title: "Browser Window"
+    id: root
-    id: testDialog
+    HifiConstants { id: hifi }
-    objectName: "Browser"
+    title: "Browser"
-    width: 1280
+    resizable: true
-    height: 720
+    contentImplicitWidth: clientArea.implicitWidth
+    contentImplicitHeight: clientArea.implicitHeight
+
+
+    Component.onCompleted: {
+        enabled = true
+        addressBar.text = webview.url
+        
+    }
+
+    onParentChanged: {
+        if (visible && enabled) {
+            forceActiveFocus();
+        }
+    }
 
     Item {
         id: clientArea
-        // The client area
+        implicitHeight: 400
-        anchors.fill: parent
+        implicitWidth: 600
-        anchors.margins: parent.margins
+        x: root.clientX
-        anchors.topMargin: parent.topMargin
+        y: root.clientY
+        width: root.clientWidth
+        height: root.clientHeight
+        
+        Row {
+            id: buttons
+            spacing: 4
+            anchors.top: parent.top
+            anchors.topMargin: 8
+            anchors.left: parent.left
+            anchors.leftMargin: 8
+            FontAwesome { 
+                id: back; size: 48; enabled: webview.canGoBack; text: "\uf0a8"
+                MouseArea { anchors.fill: parent;  onClicked: webview.goBack() }
+            }
+            FontAwesome { 
+                id: forward; size: 48; enabled: webview.canGoForward; text: "\uf0a9" 
+                MouseArea { anchors.fill: parent;  onClicked: webview.goBack() }
+            }
+            FontAwesome { 
+                id: reload; size: 48; text: webview.loading ? "\uf057" : "\uf021" 
+                MouseArea { anchors.fill: parent;  onClicked: webview.loading ? webview.stop() : webview.reload() }
+            }
+        }
+        Border {
+            id: border1
+            height: 48
+            radius: 8
+            color: "gray"
+            anchors.top: parent.top
+            anchors.topMargin: 8
+            anchors.right: parent.right
+            anchors.rightMargin: 8
+            anchors.left: buttons.right
+            anchors.leftMargin: 8
+    
+            Item {
+                id: barIcon
+                width: parent.height
+                height: parent.height
+                Image {
+                    source: webview.icon;
+                    x: (parent.height - height) / 2
+                    y: (parent.width - width) / 2
+                    verticalAlignment: Image.AlignVCenter;
+                    horizontalAlignment: Image.AlignHCenter
+                    onSourceChanged: console.log("Icon url: " + source)
+                }
+            }
+    
+            TextInput {
+                id: addressBar
+                anchors.right: parent.right
+                anchors.rightMargin: 8
+                anchors.left: barIcon.right
+                anchors.leftMargin: 0
+                anchors.verticalCenter: parent.verticalCenter
+                onAccepted: {
+                    if (text.indexOf("http") != 0) {
+                        text = "http://" + text;
+                    }
+                    webview.url = text
+                }
+            }
+    
+        }
     
         ScrollView {
-            anchors.fill: parent
+            anchors.top: buttons.bottom
+            anchors.topMargin: 8
+            anchors.bottom: parent.bottom
+            anchors.left: parent.left
+            anchors.right: parent.right
+            Rectangle { anchors.fill: parent; color: "#7500ff00" }
             WebView {
                 id: webview
-                url: "http://slashdot.org"
+                url: "http://highfidelity.com"
                 anchors.fill: parent
+                onLoadingChanged: {
+                    if (loadRequest.status == WebView.LoadSucceededStarted) {
+                        addressBar.text = loadRequest.url
                     }
                 }
-        
+                onIconChanged: {
+                    barIcon.source = icon
                 }
             }
+        }
+    } // item
+} // dialog

interface/resources/qml/controls/Dialog.qml

@@ -92,6 +92,7 @@ DialogBase {
         anchors.bottom: parent.bottom
         width: 16
         height: 16
+        z: 1000
         hoverEnabled: true
         onPressed: {
             startX = mouseX

interface/resources/qml/controls/DialogBase.qml

@@ -44,10 +44,18 @@ Item {
             anchors.left: parent.left
             border.color: root.frameColor
             clip: true
+            radius: 10
             color: root.active ?
                        hifi.colors.activeWindow.headerBackground :
                        hifi.colors.inactiveWindow.headerBackground
 
+            Rectangle {
+              y: titleBorder.height / 2
+              width: titleBorder.width
+              height: titleBorder.height /2 
+              color: titleBorder.color
+            }
+            
             Text {
                 id: titleText
                 color: root.active ?
@@ -69,7 +77,6 @@ Item {
             anchors.topMargin: -titleBorder.border.width
             anchors.right: parent.right
             anchors.left: parent.left
-            clip: true
         } // client border
     } // window border
 

interface/resources/qml/controls/TextInput.qml

@@ -13,14 +13,14 @@ Original.TextInput {
     font.family: hifi.fonts.fontFamily
     font.pointSize: hifi.fonts.fontSize
 
-
+/*
     Original.Rectangle {
         // Render the rectangle as background
         z: -1
         anchors.fill: parent
         color: hifi.colors.inputBackground
     }
-
+*/
     Text {
         anchors.fill: parent
         font.pointSize: parent.font.pointSize

interface/resources/qml/styles/HifiConstants.qml

@@ -50,7 +50,7 @@ Item {
 
     QtObject {
         id: styles
-        readonly property int borderWidth: 5
+        readonly property int borderWidth: 0
         readonly property int borderRadius: borderWidth * 2
     }
 

tests/ui/src/main.cpp

@@ -406,6 +406,8 @@ protected:
         switch (event->key()) {
         case Qt::Key_L:
             if (event->modifiers() & Qt::CTRL) {
+                auto offscreenUi = DependencyManager::get<OffscreenUi>();
+                offscreenUi->load("Browser.qml");
             }
             break;
         case Qt::Key_K: