Changeset 8 for trunk/src/widgets/qpopupmenu.cpp

Timestamp:

Nov 16, 2005, 8:36:46 PM (20 years ago)

Author:

dmik

Message:

Transferred Qt for OS/2 version 3.3.1-rc5 sources from the CVS

File:

• trunk/src/widgets/qpopupmenu.cpp (modified) (7 diffs)

trunk/src/widgets/qpopupmenu.cpp

@@ -1509 +1509 @@
         itemh = sz.height();
 
-        if ( ncols > 1 && y + itemh > contentsRect().bottom() ) {
-            if ( y < contentsRect().bottom() ) {
-                QRect rect(x, y, itemw, contentsRect().bottom() - y);
+        if ( ncols > 1 && y + itemh - 1 > contentsRect().bottom() ) {
+            if ( y <= contentsRect().bottom() ) {
+                QRect rect(x, y, itemw, contentsRect().bottom() - y + 1);
                 if(!p->hasClipping() || p->clipRegion().contains(rect)) {
                     flags = QStyle::Style_Default;
@@ -1528 +1528 @@
         ++row;
     }
-    if ( y < contentsRect().bottom() ) {
-        QRect rect(x, y, itemw, contentsRect().bottom() - y);
+    if ( y <= contentsRect().bottom() ) {
+        QRect rect(x, y, itemw, contentsRect().bottom() - y + 1);
         if(!p->hasClipping() || p->clipRegion().contains(rect)) {
             flags = QStyle::Style_Default;
@@ -1676 +1676 @@
                 actSig( mi->id(), b);
             }
+#endif
+#if defined(Q_WS_PM)
+#ifndef QT_NO_WHATSTHIS
+            else
+#endif
+//@@TODO (dmik): we need to play a sound when a disabled item is activated
+//  to conform to the OS/2 CUA. Btw, should'n it be supported by QAccessibility
+//  globally in Qt?
+                WinAlarm( HWND_DESKTOP, WA_ERROR );
 #endif
         } else  if ( popup ) {
@@ -1919 +1928 @@
 #endif
             mi = mitems->at( actItem );
-            if ( !mi->isEnabled() && !b )
+            if ( !mi->isEnabled() && !b ) {
+#if defined(Q_WS_PM)
+//@@TODO (dmik): we need to play a sound when a disabled item is activated
+//  to conform to the OS/2 CUA. Btw, should'n it be supported by QAccessibility
+//  globally in Qt?
+                WinAlarm( HWND_DESKTOP, WA_ERROR );
+#endif
                 break;
+            }
             popup = mi->popup();
             if ( popup ) {
@@ -2009 +2025 @@
                 popup->setFirstItemActive();
             } else {
+#if !defined(Q_WS_PM) // do it later, only in case of item activation
                 byeMenuBar();
+#endif
 #ifndef QT_NO_WHATSTHIS
                 bool b = QWhatsThis::inWhatsThisMode();
@@ -2016 +2034 @@
 #endif
                 if ( mi->isEnabledAndVisible() || b ) {
+#if defined(Q_WS_PM)
+                    byeMenuBar();
+#endif
                     active_popup_menu = this;
                     QGuardedPtr<QSignal> signal = mi->signal();
@@ -2023 +2044 @@
                     active_popup_menu = 0;
                 }
+#if defined(Q_WS_PM)
+//@@TODO (dmik): we need to play a sound when the disabled item is activated
+//  to conform to the OS/2 CUA. Btw, should'n it be supported by QAccessibility
+//  globally in Qt?
+                else
+                    WinAlarm( HWND_DESKTOP, WA_ERROR );
+#endif
             }
         } else if ( clashCount > 1 ) { // Clashes, highlight next...