[Bf-blender-cvs] [f4f57ed21aa] blender-v2.82-release: Fix part of T65404: quit dialog doesn't show if Blender is minimized

[Yevgeny Makarov]

Commit: f4f57ed21aa639e962fb3a28a63cc277e9f5c3ed
Author: Yevgeny Makarov
Date:   Mon Jan 27 16:07:55 2020 +0100
Branches: blender-v2.82-release
https://developer.blender.org/rBf4f57ed21aa639e962fb3a28a63cc277e9f5c3ed

Fix part of T65404: quit dialog doesn't show if Blender is minimized

This solves the problem for macOS and Linux, but not Windows yet.

Differential Revision: https://developer.blender.org/D6673

===================================================================

M	intern/ghost/intern/GHOST_WindowCocoa.mm
M	source/blender/windowmanager/intern/wm_window.c

===================================================================

diff --git a/intern/ghost/intern/GHOST_WindowCocoa.mm b/intern/ghost/intern/GHOST_WindowCocoa.mm
index 1d89da90a32..43e35faf808 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.mm
+++ b/intern/ghost/intern/GHOST_WindowCocoa.mm
@@ -799,6 +799,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setOrder(GHOST_TWindowOrder order)
 
   GHOST_ASSERT(getValid(), "GHOST_WindowCocoa::setOrder(): window invalid");
   if (order == GHOST_kWindowOrderTop) {
+    [NSApp activateIgnoringOtherApps:YES];
     [m_window makeKeyAndOrderFront:nil];
   }
   else {
diff --git a/source/blender/windowmanager/intern/wm_window.c b/source/blender/windowmanager/intern/wm_window.c
index e68d4902c66..583a11f1244 100644
--- a/source/blender/windowmanager/intern/wm_window.c
+++ b/source/blender/windowmanager/intern/wm_window.c
@@ -395,6 +395,7 @@ void wm_quit_with_optional_confirmation_prompt(bContext *C, wmWindow *win)
 
   if (U.uiflag & USER_SAVE_PROMPT) {
     if (wm_file_or_image_is_modified(C) && !G.background) {
+      wm_window_raise(win);
       wm_confirm_quit(C);
     }
     else {