From 60cc15457604dc0ed45823a38c29364e6e9bca8c Mon Sep 17 00:00:00 2001 From: Julien Wadel Date: Thu, 29 Sep 2022 18:26:16 +0200 Subject: [PATCH] Really close window on Mac. Show it when clicking on dock. --- linphone-app/src/app/App.cpp | 4 ++++ linphone-app/ui/views/App/Main/MainWindow.js | 5 ----- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/linphone-app/src/app/App.cpp b/linphone-app/src/app/App.cpp index 5d8222e77..d24d02437 100644 --- a/linphone-app/src/app/App.cpp +++ b/linphone-app/src/app/App.cpp @@ -460,6 +460,10 @@ bool App::event (QEvent *event) { } Cli::executeCommand(url); + }else if(event->type() == QEvent::ApplicationStateChange){ + auto state = static_cast(event); + if( state->applicationState() == Qt::ApplicationActive) + smartShowWindow(getMainWindow()); } return SingleApplication::event(event); diff --git a/linphone-app/ui/views/App/Main/MainWindow.js b/linphone-app/ui/views/App/Main/MainWindow.js index 4b6487ce8..187a45e16 100644 --- a/linphone-app/ui/views/App/Main/MainWindow.js +++ b/linphone-app/ui/views/App/Main/MainWindow.js @@ -41,11 +41,6 @@ function handleClosing (close) { Qt.quit() return } - - if (Qt.platform.os === 'osx') { - close.accepted = false - window.showMinimized() - } } // -----------------------------------------------------------------------------