Changeset 8 for trunk/src/styles

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

Location:

trunk/src/styles

Files:

• qcommonstyle.cpp (modified) (1 diff)
• qcompactstyle.cpp (modified) (1 diff)
• qmotifplusstyle.cpp (modified) (1 diff)
• qmotifstyle.cpp (modified) (1 diff)
• qsgistyle.cpp (modified) (1 diff)
• qwindowsstyle.cpp (modified) (8 diffs)

trunk/src/styles/qcommonstyle.cpp

@@ -146 +146 @@
 #ifndef QT_NO_LISTVIEW
     case PE_CheckListController: {
-        p->drawPixmap(r, QPixmap((const char **)check_list_controller_xpm));
+        QRect pr( r );
+        QPixmap px( (const char **)check_list_controller_xpm );
+        // center pixmap if smaller, otherwise it will be scaled to fit
+        int d = pr.width() - px.width();
+        if ( d > 0 ) {
+            pr.setX( pr.x() + d / 2 );
+            pr.setWidth( px.width() );
+        }
+        d = pr.height() - px.height();
+        if ( d > 0 ) {
+            pr.setY( pr.y() + d / 2 );
+            pr.setHeight( px.height() );
+        }
+        p->drawPixmap( pr, px );
         break; }
     case PE_CheckListExclusiveIndicator: {

trunk/src/styles/qcompactstyle.cpp

@@ -152 +152 @@
             const QPopupMenu *popupmenu = (const QPopupMenu *) widget;
             QMenuItem *mi = opt.menuItem();
+            
+            // QPopupMenu has WResizeNoErase and WRepaintNoErase flags, so we
+            // must erase areas not covered by menu items (this is requested by
+            // QPopupMenu using 0 as the menu item argument).
+            // [Win32 version feels ok without this, because it doesn't actually
+            // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+            // erases the background before WM_PAINT and after every resize].
+#if !defined (Q_WS_PM)
             if ( !mi )
                 break;
+#endif
 
             int tab = opt.tabWidth();

trunk/src/styles/qmotifplusstyle.cpp

@@ -757 +757 @@
             QPopupMenu *popupmenu = (QPopupMenu *) widget;
             QMenuItem *mi = opt.menuItem();
+            
+            // QPopupMenu has WResizeNoErase and WRepaintNoErase flags, so we
+            // must erase areas not covered by menu items (this is requested by
+            // QPopupMenu using 0 as the menu item argument).
+            // [Win32 version feels ok without this, because it doesn't actually
+            // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+            // erases the background before WM_PAINT and after every resize].
+#if !defined (Q_WS_PM)
             if ( !mi )
                 break;
+#endif
 
             int tab = opt.tabWidth();

trunk/src/styles/qmotifstyle.cpp

@@ -1004 +1004 @@
             const QPopupMenu *popupmenu = (const QPopupMenu *) widget;
             QMenuItem *mi = opt.menuItem();
+            
+            // QPopupMenu has WResizeNoErase and WRepaintNoErase flags, so we
+            // must erase areas not covered by menu items (this is requested by
+            // QPopupMenu using 0 as the menu item argument).
+            // [Win32 version feels ok without this, because it doesn't actually
+            // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+            // erases the background before WM_PAINT and after every resize].
+#if !defined (Q_WS_PM)
             if ( !mi )
                 break;
+#endif
 
             int tab = opt.tabWidth();

trunk/src/styles/qsgistyle.cpp

@@ -946 +946 @@
                 break;
             QMenuItem *mi = opt.menuItem();
+            
+            // QPopupMenu has WResizeNoErase and WRepaintNoErase flags, so we
+            // must erase areas not covered by menu items (this is requested by
+            // QPopupMenu using 0 as the menu item argument).
+            // [Win32 version feels ok without this, because it doesn't actually
+            // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+            // erases the background before WM_PAINT and after every resize].
+#if !defined (Q_WS_PM)
             if ( !mi )
                 break;
+#endif
             const QPopupMenu *popupmenu = (const QPopupMenu *) widget;
             int tab = opt.tabWidth();

trunk/src/styles/qwindowsstyle.cpp

@@ -85 +85 @@
 enum QSliderDirection { SlUp, SlDown, SlLeft, SlRight };
 
+#ifndef QT_NO_MENUDATA
 // A friendly class providing access to QMenuData's protected member.
 class FriendlyMenuData : public QMenuData
@@ -90 +91 @@
     friend class QWindowsStyle;
 };
+#endif
 
 // Private class
@@ -158 +160 @@
         break;
     case QEvent::KeyRelease:
+#ifndef QT_NO_MENUDATA
         if (((QKeyEvent*)e)->key() == Key_Alt) {
             widget = widget->topLevelWidget();
@@ -172 +175 @@
             }
         }
+#endif
         break;
     case QEvent::FocusIn:
     case QEvent::FocusOut:
+#ifndef QT_NO_MENUBAR
         {
             // Menubars toggle based on focus
@@ -181 +186 @@
                 menuBarTimer = menuBar->startTimer(0);
         }
+#endif
         break;
     case QEvent::Close:
@@ -188 +194 @@
         break;
     case QEvent::Timer:
+#ifndef QT_NO_MENUBAR
         {
             QMenuBar *menuBar = ::qt_cast<QMenuBar*>(o);
@@ -198 +205 @@
             }
         }
+#endif
         break;
     default:
@@ -841 +849 @@
             const QPopupMenu *popupmenu = (const QPopupMenu *) widget;
             QMenuItem *mi = opt.menuItem();
+            
+            // QPopupMenu has WResizeNoErase and WRepaintNoErase flags, so we
+            // must erase areas not covered by menu items (this is requested by
+            // QPopupMenu using 0 as the menu item argument).
+            // [Win32 version feels ok without this, because it doesn't actually
+            // fully obey WResizeNoErase and WRepaintNoErase: WM_ERASEBKGND always
+            // erases the background before WM_PAINT and after every resize].
+#if !defined (Q_WS_PM)
             if ( !mi )
                 break;
-
+#endif
+            
             int tab = opt.tabWidth();
             int maxpmw = opt.maxIconWidth();