From 363963959aafda4365154a59e19d519caf55c2ff Mon Sep 17 00:00:00 2001
From: Ronan Abhamon <ronan.abhamon@belledonne-communications.com>
Date: Wed, 22 Feb 2017 09:30:55 +0100
Subject: [PATCH] feat(ui/views/App/Main/MainWindow): remove
 `isInitiallyIconified` helper, set visibility directly with cpp

---
 linphone-desktop/src/app/App.cpp              | 16 ++++++--------
 linphone-desktop/src/app/App.hpp              |  4 +---
 .../ui/views/App/Main/MainWindow.qml          | 22 +++++++++----------
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/linphone-desktop/src/app/App.cpp b/linphone-desktop/src/app/App.cpp
index f4611932c..97bdf6d58 100644
--- a/linphone-desktop/src/app/App.cpp
+++ b/linphone-desktop/src/app/App.cpp
@@ -146,13 +146,11 @@ void App::initContentApp () {
 
   #endif // ifndef __APPLE__
 
-  if (m_parser.isSet("selftest")) {
-    QTimer::singleShot(300, this, &App::quit);
-  }
-}
+  if (!m_parser.isSet("iconified"))
+    getMainWindow()->setVisible(true);
 
-bool App::isInitiallyIconified () const {
-  return m_parser.isSet("iconified");
+  if (m_parser.isSet("selftest"))
+    QTimer::singleShot(300, this, &App::quit);
 }
 
 // -----------------------------------------------------------------------------
@@ -163,9 +161,9 @@ void App::parseArgs () {
   m_parser.addVersionOption();
   m_parser.addOptions({
     { "config", tr("commandLineOptionConfig"), "file" },
-  #ifndef __APPLE__
-    { "iconified", tr("commandLineOptionIconified") },
-  #endif // __APPLE__
+    #ifndef __APPLE__
+      { "iconified", tr("commandLineOptionIconified") },
+    #endif // __APPLE__
     { "selftest", tr("commandLineOptionSelftest") },
     { { "V", "verbose" }, tr("commandLineOptionVerbose") }
   });
diff --git a/linphone-desktop/src/app/App.hpp b/linphone-desktop/src/app/App.hpp
index 75dd6336c..14cfe8522 100644
--- a/linphone-desktop/src/app/App.hpp
+++ b/linphone-desktop/src/app/App.hpp
@@ -54,11 +54,9 @@ public:
 
   bool hasFocus () const;
 
-  Q_INVOKABLE QQuickWindow *getSettingsWindow () const;
-
   void initContentApp ();
 
-  Q_INVOKABLE bool isInitiallyIconified () const;
+  Q_INVOKABLE QQuickWindow *getSettingsWindow () const;
 
   Q_INVOKABLE QString locale () const {
     return m_locale;
diff --git a/linphone-desktop/ui/views/App/Main/MainWindow.qml b/linphone-desktop/ui/views/App/Main/MainWindow.qml
index d5103b6e4..13ae31af1 100644
--- a/linphone-desktop/ui/views/App/Main/MainWindow.qml
+++ b/linphone-desktop/ui/views/App/Main/MainWindow.qml
@@ -65,6 +65,14 @@ Controls1.ApplicationWindow {
     }
   }
 
+  function _forceView (view, props) {
+    collapse.setCollapsed(true)
+
+    _updateSelectedEntry(view, props)
+    _currentView = view
+    contentLoader.setSource(view + '.qml', props || {})
+  }
+
   function _setView (view, props) {
     if (window.visibility === Window.Minimized) {
       window.visibility = Window.AutomaticVisibility
@@ -72,12 +80,7 @@ Controls1.ApplicationWindow {
       window.setVisible(true)
     }
 
-    window.requestActivate()
-    collapse.setCollapsed(true)
-
-    _updateSelectedEntry(view, props)
-    _currentView = view
-    contentLoader.setSource(view + '.qml', props || {})
+    _forceView()
   }
 
   // ---------------------------------------------------------------------------
@@ -91,7 +94,7 @@ Controls1.ApplicationWindow {
   width: MainWindowStyle.width
 
   title: MainWindowStyle.title
-  visible: true
+  visible: false
 
   // ---------------------------------------------------------------------------
   // Menu bar.
@@ -104,10 +107,7 @@ Controls1.ApplicationWindow {
   // ---------------------------------------------------------------------------
 
   Component.onCompleted: Utils.setTimeout(window, 0, function () {
-    _setView('Home')
-    if (App.isInitiallyIconified()) {
-      window.hide()
-    }
+    _forceView('Home')
   })
 
   onActiveFocusItemChanged: activeFocusItem == null && smartSearchBar.hideMenu()