mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-30 02:19:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Ronan Abhamon 2017-02-21 16:59:51 +01:00
parent 93371b8718
commit 4ce2c6f99b
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linphone-desktop/src/app/Logger.hpp
View file

@ -30,7 +30,7 @@
class Logger {
public:
static void init ();
static Logger * instance () { return m_instance; };
static Logger *instance () { return m_instance; };
bool isVerbose () const { return m_verbose; };
void setVerbose (bool verbose) { m_verbose = verbose; };

2
linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedFileMessage.qml
View file

@ -13,7 +13,7 @@ Notification {
// ---------------------------------------------------------------------------
property string _fileUri: notificationData ? notificationData.fileUri : ''
property string _fileUri: notificationData && notificationData.fileUri || ''
// ---------------------------------------------------------------------------

2
linphone-desktop/ui/modules/Linphone/Notifications/NotificationReceivedMessage.qml
View file

@ -12,7 +12,7 @@ Notification {
// ---------------------------------------------------------------------------
property string _sipAddress: notificationData ? notificationData.sipAddress : ''
property string _sipAddress: notificationData && notificationData.sipAddress || ''
property var _contact: _contactObserver.contact
property var _contactObserver: SipAddressesModel.getContactObserver(_sipAddress)

8
linphone-desktop/ui/views/App/Main/MainWindow.qml
View file

@ -1,6 +1,7 @@
import QtQuick 2.7
import QtQuick.Controls 2.0
import QtQuick.Layouts 1.3
import QtQuick.Window 2.2
// Explicit import to support Toolbar.
import QtQuick.Controls 1.4 as Controls1
@ -65,7 +66,12 @@ Controls1.ApplicationWindow {
}
function _setView (view, props) {
window.show()
if (window.visibility === Window.Minimized) {
window.visibility = Window.AutomaticVisibility
} else {
window.setVisible(true)
}
window.requestActivate()
collapse.setCollapsed(true)