diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-02-04 14:01:30 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-02-04 14:01:30 (GMT) |
| commit | 79766609a5c988174599882a9f3124f3fa8dfc1c (patch) | |
| tree | 7f5d90112f9c7fca641ec48d59d84d213829703e | |
| parent | e39feabbcdb10b47c7eaad14fe653e62280e6237 (diff) | |
| parent | af7d2b2127dadbdf828c60c75255bb1b4f591651 (diff) | |
| download | Qt-79766609a5c988174599882a9f3124f3fa8dfc1c.zip Qt-79766609a5c988174599882a9f3124f3fa8dfc1c.tar.gz Qt-79766609a5c988174599882a9f3124f3fa8dfc1c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1
| -rw-r--r-- | src/gui/kernel/qwidget_win.cpp | 2 | ||||
| -rw-r--r-- | src/gui/util/qsystemtrayicon_win.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index a57aacc..6a36293 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -1156,6 +1156,8 @@ void QWidgetPrivate::show_sys() data.window_state |= Qt::WindowMinimized; if (IsZoomed(q->internalWinId())) data.window_state |= Qt::WindowMaximized; + if (q->windowType() == Qt::Popup) + q->activateWindow(); } winSetupGestures(); diff --git a/src/gui/util/qsystemtrayicon_win.cpp b/src/gui/util/qsystemtrayicon_win.cpp index 092909f..8e482e0 100644 --- a/src/gui/util/qsystemtrayicon_win.cpp +++ b/src/gui/util/qsystemtrayicon_win.cpp @@ -325,8 +325,6 @@ bool QSystemTrayIconSys::winEvent( MSG *m, long *result ) q->contextMenu()->move(gpos); } #endif - q->contextMenu()->activateWindow(); - //Must be activated for proper keyboardfocus and menu closing on windows: } emit q->activated(QSystemTrayIcon::Context); break; |