diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-03-29 16:10:09 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-03-29 16:10:09 +0100 |
| commit | 902dc50c873670c7241988758470c87cdde5f429 (patch) | |
| tree | dc36730f3fbff47fbf8066d778d64fa4a7357794 /gui | |
| parent | c069147f67a508eba010157c6493b0a9f2c2760a (diff) | |
| parent | a19aca0648a6bc8b40c71bac705fd7ddbd58a559 (diff) | |
| download | MultiMC-902dc50c873670c7241988758470c87cdde5f429.tar MultiMC-902dc50c873670c7241988758470c87cdde5f429.tar.gz MultiMC-902dc50c873670c7241988758470c87cdde5f429.tar.lz MultiMC-902dc50c873670c7241988758470c87cdde5f429.tar.xz MultiMC-902dc50c873670c7241988758470c87cdde5f429.zip | |
Merge branch 'release-0.3' into develop
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/ConsoleWindow.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/gui/ConsoleWindow.cpp b/gui/ConsoleWindow.cpp index d11e8aff..621f035f 100644 --- a/gui/ConsoleWindow.cpp +++ b/gui/ConsoleWindow.cpp @@ -186,6 +186,11 @@ void ConsoleWindow::toggleConsole() QScrollBar *bar = ui->text->verticalScrollBar(); if (isVisible()) { + if(!isActiveWindow()) + { + activateWindow(); + return; + } int max_bar = bar->maximum(); int val_bar = m_last_scroll_value = bar->value(); m_scroll_active = (max_bar - val_bar) <= 1; @@ -194,6 +199,7 @@ void ConsoleWindow::toggleConsole() else { show(); + isTopLevel(); if (m_scroll_active) { bar->setValue(bar->maximum()); |