From ebb194114343000fd1d6f38d295543b6aca17b9e Mon Sep 17 00:00:00 2001 From: Enrico Forestieri Date: Tue, 5 Jul 2016 23:19:59 +0200 Subject: [PATCH] Bring window to front only for single-instance mode A window manager could be configured such that to maintain a certain stack order for the windows. It would be annoying that opening a new file through menu brings up the window, so do this only if we are loading a file through the lyx-server. This commit amends f5f8c6fd, so no status line is needed. --- src/frontends/qt4/GuiApplication.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/frontends/qt4/GuiApplication.cpp b/src/frontends/qt4/GuiApplication.cpp index 9abcf061f8..375a6ac88a 100644 --- a/src/frontends/qt4/GuiApplication.cpp +++ b/src/frontends/qt4/GuiApplication.cpp @@ -1662,16 +1662,18 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr) current_view_->openDocument(fname); if (!current_view_->documentBufferView()) current_view_->close(); - else { + else if (cmd.origin() == FuncRequest::LYXSERVER) { current_view_->raise(); current_view_->activateWindow(); current_view_->showNormal(); } } else { current_view_->openDocument(fname); - current_view_->raise(); - current_view_->activateWindow(); - current_view_->showNormal(); + if (cmd.origin() == FuncRequest::LYXSERVER) { + current_view_->raise(); + current_view_->activateWindow(); + current_view_->showNormal(); + } } break; }