Reworked menu bar to use burger

linphone-desktop/ui/views/App/Main/MainWindow.qml

@@ -47,9 +47,9 @@ ApplicationWindow {
   // Menu bar.
   // ---------------------------------------------------------------------------
 
-  menuBar: MainWindowMenuBar {
+  /*menuBar: MainWindowMenuBar {
     hide: mainLoader.item ? !mainLoader.item.collapse.isCollapsed : true
-  }
+  }*/
 
   // ---------------------------------------------------------------------------
 
@@ -184,6 +184,20 @@ ApplicationWindow {
               visible: !smartSearchBar.isOpen
             }
           }
+
+          Icon {
+            icon: 'burger_menu_normal'
+            iconSize: 16
+
+            MainWindowMenuBar {
+              id: mainmenu
+            }
+
+            MouseArea {
+              anchors.fill: parent
+              onClicked: mainmenu.open()
+            }
+          }
         }
       }
 

linphone-desktop/ui/views/App/Main/MainWindowMenuBar.qml

 import QtQuick 2.7
-import QtQuick.Controls 1.4
+import QtQuick.Controls 2.1
 import QtQuick.Controls.Styles 1.4
 import QtQuick.Window 2.2
+import Qt.labs.platform 1.0
 
 import Linphone 1.0
 
@@ -9,112 +10,15 @@ import App.Styles 1.0
 
 // =============================================================================
 
-MenuBar {
-  id: container
-
-  // ---------------------------------------------------------------------------
-
-  property bool hide: false
-
-  // ---------------------------------------------------------------------------
-
-  // Workaround to hide toolbar.
-  // Use private properties of MenuBar.
-
-  __contentItem.height: hide
-    ? 0
-    : MainWindowMenuBarStyle.height
-
-  __contentItem.transform: Scale {
-    yScale: Number(!hide)
-  }
-
-  // ---------------------------------------------------------------------------
-
-  style: MenuBarStyle {
-    background: Rectangle {
-      color: MainWindowMenuBarStyle.color
-
-      Rectangle {
-        anchors.bottom: parent.bottom
-        color: MainWindowMenuBarStyle.separator.color
-        height: MainWindowMenuBarStyle.separator.height
-        width: parent.width
-      }
+Item {
+  function open() {
+    menu.open()
   }
 
-    menuStyle: MenuStyle {
-      id: menuStyle
-
-      font.pointSize: MainWindowMenuBarStyle.subMenu.text.fontSize
-
-      frame: Item {}
-
-      itemDelegate {
-        background: Rectangle {
-          color: (styleData.selected || styleData.open)
-            ? MainWindowMenuBarStyle.subMenu.color.selected
-            : MainWindowMenuBarStyle.subMenu.color.normal
-        }
-
-        label: Label {
-          color: styleData.selected
-            ? MainWindowMenuBarStyle.subMenu.text.color.selected
-            : MainWindowMenuBarStyle.subMenu.text.color.normal
-          font: menuStyle.font
-          text: styleData.text
-        }
-
-        shortcut: Label {
-          color: styleData.selected
-            ? MainWindowMenuBarStyle.subMenu.text.color.selected
-            : MainWindowMenuBarStyle.subMenu.text.color.normal
-          font: menuStyle.font
-          text: styleData.shortcut
-        }
-      }
-    }
-
-    itemDelegate: Item {
-      implicitHeight: menuItem.height + MainWindowMenuBarStyle.separator.spacing
-      implicitWidth: menuItem.width
-
-      Item {
-        id: menuItem
-
-        implicitHeight: text.height + MainWindowMenuBarStyle.menu.text.verticalMargins * 2
-        implicitWidth: text.width + MainWindowMenuBarStyle.menu.text.horizontalMargins * 2
-
-        Text {
-          id: text
-
-          anchors.centerIn: parent
-          color: styleData.open
-            ? MainWindowMenuBarStyle.menu.text.color.selected
-            : MainWindowMenuBarStyle.menu.text.color.normal
-
-          font.pointSize: MainWindowMenuBarStyle.menu.text.fontSize
-          text: formatMnemonic(styleData.text, styleData.underlineMnemonic)
-        }
-
-        Rectangle {
-          anchors.bottom: parent.bottom
-          color: MainWindowMenuBarStyle.menu.indicator.color
-          visible: styleData.open
-
-          height: MainWindowMenuBarStyle.menu.indicator.height
-          width: parent.width
-        }
-      }
-    }
-  }
-
-  // ---------------------------------------------------------------------------
-  // Options.
-  // ---------------------------------------------------------------------------
-
   Menu {
+    id: menu
 
+    Menu {
       title: qsTr('options')
 
       MenuItem {
@@ -180,4 +84,5 @@ MenuBar {
         onTriggered: console.log('TODO')
       }
     }
+  }
 }
\ No newline at end of file