From d29da1daa4777f7ed6c5ee37306e25b3c380beea Mon Sep 17 00:00:00 2001
From: Stephan Witt <switt@lyx.org>
Date: Sat, 16 Apr 2016 22:30:33 +0200
Subject: [PATCH] Handle activateWindow in LFUN_BUFFER_SWITCH like in
 saveBufferIfNeeded() and doShowDialog() methods. This is a requirement on Mac
 to get the current buffer view topmost after buffer switch.

---
 src/frontends/qt4/GuiView.cpp | 2 ++
 status.22x                    | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index c2101f3965..8133ac246f 100644
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -3615,7 +3615,9 @@ void GuiView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 			for (; i != ids.size(); ++i) {
 				GuiView & gv = guiApp->view(ids[i]);
 				if (gv.workArea(*buffer)) {
+					gv.raise();
 					gv.activateWindow();
+					gv.setFocus();
 					gv.setBuffer(buffer);
 					break;
 				}
diff --git a/status.22x b/status.22x
index a5f24f9e48..85275a748a 100644
--- a/status.22x
+++ b/status.22x
@@ -48,6 +48,9 @@ What's new
 
 - Fix on screen narrow box when using \width as box width unit (bug 10048).
 
+- Raise GuiView on buffer switch to bring it topmost in multi-window mode.
+
+
 * INTERNALS