1 files changed, 5 insertions, 42 deletions

diff --git a/main.qml b/main.qml
index 4c409d76..a601596c 100644
--- a/main.qml
+++ b/main.qml
@@ -656,7 +656,7 @@ ApplicationWindow {
     width: rightPanelExpanded ? 1269 : 1269 - 300
     height: maxWindowHeight;
     color: "#FFFFFF"
-    flags: Qt.FramelessWindowHint | Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint
+    flags: Qt.WindowSystemMenuHint | Qt.Window | Qt.WindowMinimizeButtonHint | Qt.WindowCloseButtonHint | Qt.WindowTitleHint | Qt.WindowMaximizeButtonHint
     onWidthChanged: x -= 0
 
 
@@ -791,10 +791,7 @@ ApplicationWindow {
                 PropertyChanges { target: appWindow; width: 930; }
                 PropertyChanges { target: appWindow; height: 595; }
                 PropertyChanges { target: resizeArea; visible: false }
-                PropertyChanges { target: titleBar; maximizeButtonVisible: false }
                 PropertyChanges { target: frameArea; blocked: true }
-                PropertyChanges { target: titleBar; y: 0 }
-                PropertyChanges { target: titleBar; title: qsTr("Program setup wizard") + translationManager.emptyString }
             }, State {
                 name: "normal"
                 PropertyChanges { target: leftPanel; visible: true }
@@ -805,10 +802,7 @@ ApplicationWindow {
                 PropertyChanges { target: appWindow; width: rightPanelExpanded ? 1269 : 1269 - 300; }
                 PropertyChanges { target: appWindow; height: maxWindowHeight; }
                 PropertyChanges { target: resizeArea; visible: true }
-                PropertyChanges { target: titleBar; maximizeButtonVisible: true }
                 PropertyChanges { target: frameArea; blocked: false }
-                PropertyChanges { target: titleBar; y: 0 }
-                PropertyChanges { target: titleBar; title: qsTr("Monero") + translationManager.emptyString }
             }
         ]
 
@@ -862,11 +856,6 @@ ApplicationWindow {
             height: 30
             z: 1
             hoverEnabled: true
-            // Uncomment to enable 'auto-hidden' titlebar
-            /*
-            onEntered: if(!blocked) titleBar.y = 0
-            onExited: if(!blocked) titleBar.y = -titleBar.height
-            */
             propagateComposedEvents: true
             onPressed: mouse.accepted = false
             onReleased: mouse.accepted = false
@@ -882,11 +871,6 @@ ApplicationWindow {
                 value: Window.Windowed
             }
             PropertyAction {
-                target: titleBar
-                properties: "maximizeButtonVisible"
-                value: false
-            }
-            PropertyAction {
                 target: frameArea
                 properties: "blocked"
                 value: true
@@ -974,11 +958,6 @@ ApplicationWindow {
                 properties: "blocked"
                 value: false
             }
-            PropertyAction {
-                target: titleBar
-                properties: "maximizeButtonVisible"
-                value: true
-            }
         }
 
         WizardMain {
@@ -1041,8 +1020,10 @@ ApplicationWindow {
 
         TitleBar {
             id: titleBar
-            anchors.left: parent.left
-            anchors.right: parent.right
+            x: 0
+            y: 0
+            width: 30
+            height: 30
             onGoToBasicVersion: {
                 if (yes) {
                     // basicPanel.currentView = middlePanel.currentView
@@ -1052,24 +1033,6 @@ ApplicationWindow {
                     goToProAnimation.start()
                 }
             }
-
-            MouseArea {
-                property var previousPosition
-                anchors.fill: parent
-                propagateComposedEvents: true
-                onPressed: previousPosition = globalCursor.getPosition()
-                onPositionChanged: {
-                    if (pressedButtons == Qt.LeftButton) {
-                        var pos = globalCursor.getPosition()
-                        var dx = pos.x - previousPosition.x
-                        var dy = pos.y - previousPosition.y
-
-                        appWindow.x += dx
-                        appWindow.y += dy
-                        previousPosition = pos
-                    }
-                }
-            }
         }
     }
     onClosing: {