src/gui/util/qsystemtrayicon_win.cpp
changeset 30 5dc02b23752f
parent 25 e24348a560a6
child 33 3e2da88830cd
equal deleted inserted replaced
29:b72c6db6890b 30:5dc02b23752f
    51 #define NIN_BALLOONUSERCLICK (WM_USER + 5)
    51 #define NIN_BALLOONUSERCLICK (WM_USER + 5)
    52 #endif
    52 #endif
    53 
    53 
    54 #include <qt_windows.h>
    54 #include <qt_windows.h>
    55 #include <commctrl.h>
    55 #include <commctrl.h>
    56 #include <shlwapi.h>
       
    57 #include <QBitmap>
    56 #include <QBitmap>
    58 #include <QLibrary>
    57 #include <QLibrary>
    59 #include <QApplication>
    58 #include <QApplication>
    60 #include <QToolTip>
    59 #include <QToolTip>
    61 #include <QDesktopWidget>
    60 #include <QDesktopWidget>
   299                 break;
   298                 break;
   300 
   299 
   301             case WM_RBUTTONUP:
   300             case WM_RBUTTONUP:
   302                 if (q->contextMenu()) {
   301                 if (q->contextMenu()) {
   303                     q->contextMenu()->popup(gpos);
   302                     q->contextMenu()->popup(gpos);
   304                     q->contextMenu()->activateWindow();
       
   305                     //Must be activated for proper keyboardfocus and menu closing on windows:
       
   306                 }
   303                 }
   307                 emit q->activated(QSystemTrayIcon::Context);
   304                 emit q->activated(QSystemTrayIcon::Context);
   308                 break;
   305                 break;
   309 
   306 
   310             case NIN_BALLOONUSERCLICK:
   307             case NIN_BALLOONUSERCLICK: