Commit 4ce2c6f9 authored by Ronan Abhamon's avatar Ronan Abhamon

fix(ui/views/App/Main/MainWindow): handle correcty window visibility

parent 93371b87
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
class Logger { class Logger {
public: public:
static void init (); static void init ();
static Logger * instance () { return m_instance; }; static Logger *instance () { return m_instance; };
bool isVerbose () const { return m_verbose; }; bool isVerbose () const { return m_verbose; };
void setVerbose (bool verbose) { m_verbose = verbose; }; void setVerbose (bool verbose) { m_verbose = verbose; };
......
...@@ -13,7 +13,7 @@ Notification { ...@@ -13,7 +13,7 @@ Notification {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
property string _fileUri: notificationData ? notificationData.fileUri : '' property string _fileUri: notificationData && notificationData.fileUri || ''
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
......
...@@ -12,7 +12,7 @@ Notification { ...@@ -12,7 +12,7 @@ Notification {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
property string _sipAddress: notificationData ? notificationData.sipAddress : '' property string _sipAddress: notificationData && notificationData.sipAddress || ''
property var _contact: _contactObserver.contact property var _contact: _contactObserver.contact
property var _contactObserver: SipAddressesModel.getContactObserver(_sipAddress) property var _contactObserver: SipAddressesModel.getContactObserver(_sipAddress)
......
import QtQuick 2.7 import QtQuick 2.7
import QtQuick.Controls 2.0 import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
import QtQuick.Window 2.2
// Explicit import to support Toolbar. // Explicit import to support Toolbar.
import QtQuick.Controls 1.4 as Controls1 import QtQuick.Controls 1.4 as Controls1
...@@ -65,7 +66,12 @@ Controls1.ApplicationWindow { ...@@ -65,7 +66,12 @@ Controls1.ApplicationWindow {
} }
function _setView (view, props) { function _setView (view, props) {
window.show() if (window.visibility === Window.Minimized) {
window.visibility = Window.AutomaticVisibility
} else {
window.setVisible(true)
}
window.requestActivate() window.requestActivate()
collapse.setCollapsed(true) collapse.setCollapsed(true)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment