Merge remote-tracking branch 'origin/master'

hluk · Dec 21, 2016 · 894ab91 · 894ab91
2 parents 02e514d + ea88619
commit 894ab91
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,8 @@
+v2.8.2
+- Fixed focusing tray menu from command
+- Fixed dialog button translation on Windows
+- Fixed passing big data to commands
+
 v2.8.1
 - All Qt messages are logged
 - Fixed and improved commands for Tags plugin

diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp
@@ -1898,6 +1898,13 @@ bool MainWindow::toggleMenu(ClipboardBrowser *browser)
 {
     m_trayTab = browser;
     m_trayMenu->toggle();
+
+    // Try to steal focus.
+    m_trayMenu->raise();
+    m_trayMenu->activateWindow();
+    QApplication::setActiveWindow(m_trayMenu);
+    stealFocus(*m_trayMenu);
+
     m_trayTab = NULL;
     return m_trayMenu->isVisible();
 }