]> git.lyx.org Git - features.git/commitdiff
Bring window to front after loading a document
authorEnrico Forestieri <forenr@lyx.org>
Sun, 3 Jul 2016 20:58:25 +0000 (22:58 +0200)
committerEnrico Forestieri <forenr@lyx.org>
Sun, 3 Jul 2016 20:58:25 +0000 (22:58 +0200)
Fixes #7875.

src/frontends/qt4/GuiApplication.cpp

index a8611f784dc49e265a783b50cd46af95e55f21d5..9d2f3c318c1f9547d9165da9dd099bf4c1deb83f 100644 (file)
@@ -1678,14 +1678,21 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
                        // but let's make sure
                        LASSERT(current_view_, break);
                        current_view_->openDocument(fname);
-                       // FIXME but then why check current_view_ here?
-                       if (current_view_ && !current_view_->documentBufferView())
+                       if (!current_view_->documentBufferView())
                                current_view_->close();
+                       else {
+                               current_view_->raise();
+                               current_view_->activateWindow();
+                               current_view_->showNormal();
+                       }
                } else {
                        // we know !d->views.empty(), so this should be ok
                        // but let's make sure
                        LASSERT(current_view_, break);
                        current_view_->openDocument(fname);
+                       current_view_->raise();
+                       current_view_->activateWindow();
+                       current_view_->showNormal();
                }
                break;
        }