Initial work on client-side window decorations

papyros · Jan 31, 2015 · 1e3fd29 · 1e3fd29
1 parent 0157323
commit 1e3fd29
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 1 deletion.
diff --git a/modules/Material/ApplicationWindow.qml b/modules/Material/ApplicationWindow.qml
@@ -75,6 +75,8 @@ Controls.ApplicationWindow {
 
     property bool clientSideDecorations: false
 
+    flags: clientSideDecorations ? Qt.FramelessWindowHint : 0
+
     AppTheme {
         id: __theme
     }
@@ -84,6 +86,8 @@ Controls.ApplicationWindow {
         width: parent.width
         backgroundColor: Theme.primaryColor
         z: 1
+
+        clientSideDecorations: app.clientSideDecorations
     }
 
     PageStack {

diff --git a/modules/Material/Toolbar.qml b/modules/Material/Toolbar.qml
@@ -96,9 +96,13 @@ View {
 
     Controls.StackView {
         id: stack
-        width: parent.width
         height: toolbar.implicitHeight
 
+        anchors {
+            left: parent.left
+            right: clientSideDecorations ? windowControls.left : parent.right
+        }
+
         delegate: Controls.StackViewDelegate {
             pushTransition: Controls.StackViewTransition {
                 SequentialAnimation {
@@ -147,6 +151,24 @@ View {
         }
     }
 
+    Row {
+        id: windowControls
+
+        anchors {
+            verticalCenter: stack.verticalCenter
+            right: parent.right
+            rightMargin: units.dp(16)
+        }
+
+        spacing: units.dp(24)
+
+        IconButton {
+            name: "navigation/close"
+            color: Theme.lightDark(toolbar.backgroundColor, Theme.light.textColor,
+                Theme.dark.textColor)
+        }
+    }
+
     Tabs {
         id: tabbar
         color: toolbar.backgroundColor