author | sandman <sandman> | 2002-11-25 01:14:19 (UTC) |
---|---|---|
committer | sandman <sandman> | 2002-11-25 01:14:19 (UTC) |
commit | 1b4665ddf28fdb59810b90138a5a88f87a2d9bc6 (patch) (unidiff) | |
tree | 14254d02145e88f1970f3c26af4ad006ab00c15a /core/launcher | |
parent | da8050fe68a443773447ee176793a30df256ea9b (diff) | |
download | opie-1b4665ddf28fdb59810b90138a5a88f87a2d9bc6.zip opie-1b4665ddf28fdb59810b90138a5a88f87a2d9bc6.tar.gz opie-1b4665ddf28fdb59810b90138a5a88f87a2d9bc6.tar.bz2 |
*** empty log message ***
-rw-r--r-- | core/launcher/desktop.cpp | 23 | ||||
-rw-r--r-- | core/launcher/desktop.h | 1 | ||||
-rw-r--r-- | core/launcher/startmenu.cpp | 7 |
3 files changed, 10 insertions, 21 deletions
diff --git a/core/launcher/desktop.cpp b/core/launcher/desktop.cpp index 3e8c731..34b52d2 100644 --- a/core/launcher/desktop.cpp +++ b/core/launcher/desktop.cpp | |||
@@ -354,6 +354,6 @@ bool DesktopApplication::qwsEventFilter( QWSEvent *e ) | |||
354 | 354 | ||
355 | // if ( ke->simpleData.keycode == Key_F11 ) { | 355 | if ( ke->simpleData.keycode == Key_F11 ) { |
356 | // if ( press ) emit menu(); | 356 | if ( press ) emit menu(); |
357 | // return TRUE; | 357 | return TRUE; |
358 | // } | 358 | } |
359 | 359 | ||
@@ -905,16 +905 @@ void Desktop::soundAlarm() | |||
905 | |||
906 | bool Desktop::eventFilter( QObject *, QEvent *ev ) | ||
907 | { | ||
908 | if ( ev->type() == QEvent::KeyPress ) { | ||
909 | QKeyEvent *ke = (QKeyEvent *)ev; | ||
910 | if ( ke->key() == Qt::Key_F11 ) { // menu key | ||
911 | QWidget *active = qApp->activeWindow(); | ||
912 | if ( active && active->isPopup() ) { | ||
913 | active->close(); | ||
914 | } | ||
915 | raiseMenu(); | ||
916 | return TRUE; | ||
917 | } | ||
918 | } | ||
919 | return FALSE; | ||
920 | } | ||
diff --git a/core/launcher/desktop.h b/core/launcher/desktop.h index f6059b8..13f28b3 100644 --- a/core/launcher/desktop.h +++ b/core/launcher/desktop.h | |||
@@ -132,3 +132,2 @@ protected: | |||
132 | void timerEvent( QTimerEvent *e ); | 132 | void timerEvent( QTimerEvent *e ); |
133 | bool eventFilter( QObject *, QEvent * ); | ||
134 | 133 | ||
diff --git a/core/launcher/startmenu.cpp b/core/launcher/startmenu.cpp index d9382d2..e663072 100644 --- a/core/launcher/startmenu.cpp +++ b/core/launcher/startmenu.cpp | |||
@@ -249,5 +249,10 @@ void StartMenu::launch() | |||
249 | launchMenu->hide(); | 249 | launchMenu->hide(); |
250 | else | 250 | else { |
251 | QWidget *active = qApp->activeWindow(); | ||
252 | if ( active && active->isPopup() ) | ||
253 | active->close(); | ||
254 | |||
251 | launchMenu->popup( QPoint( 1, y ) ); | 255 | launchMenu->popup( QPoint( 1, y ) ); |
252 | } | 256 | } |
257 | } | ||
253 | 258 | ||