Changeset 108

Timestamp:

Jul 30, 2006, 11:27:57 AM (19 years ago)

Author:

dmik

Message:

Widgets: Added the non-scaling threshold when setting a top-level widgets's icon. This allows to avoid scaling pixmaps close to the target icon size (e.g. 16x16 to 20x20) to give them a better look (such pixmaps are centered instead of scaling).

Location:

trunk/src/kernel

Files:

• qpixmap_pm.cpp (modified) (4 diffs)
• qwidget_pm.cpp (modified) (1 diff)

trunk/src/kernel/qpixmap_pm.cpp

@@ -1057 +1057 @@
             h /= 2;
         }
+
+        QPixmap pm = *this;
+
+#if !defined(QT_PM_NO_ICON_THRESHOLD)
+        // non-scalable threshold
+        enum { tmax = 12 };
+        int tw = w / 4;
+        int th = h / 4;
+        // difference
+        int dw = w - data->w;
+        int dh = h - data->h;
         
-        QPixmap pm = *this;
-        if ( data->w != w || data->h != h ) {
+        if ( (tw <= tmax && th <= tmax) &&
+             ((data->w >= data->h && dw > 0 && dw <= tw) ||
+              (dh > 0 && dh <= th)) ) {
+            pm = QPixmap( w, h );
+            LONG ofsx = dw / 2;
+            LONG ofsy = dh / 2;
+            POINTL ptls[] = {
+                { ofsx, ofsy }, { data->w + ofsx, data->h + ofsy },
+                { 0, 0 },
+            };
+            GpiBitBlt( pm.hps, hps, 3, ptls, ROP_SRCCOPY, BBO_IGNORE );
+            QBitmap msk = QBitmap( w, h );
+            msk.fill( color0 );
+            if ( data->mask ) {
+                GpiBitBlt( msk.hps, data->mask->hps, 3, ptls, ROP_SRCCOPY, BBO_IGNORE );
+            } else {
+                GpiBitBlt( msk.hps, NULL, 3, ptls, ROP_ONE, BBO_IGNORE );
+            }
+            pm.setMask( msk );
+            // correct the hot spot
+            hotX += ofsx;
+            hotY += ofsy;
+        } else
+#endif        
+        {
+            if ( data->w != w || data->h != h ) {
+                QImage i = convertToImage();
 #if !defined(QT_NO_IMAGE_SMOOTHSCALE)
-            // do smooth resize until icon is two or more times bigger
-            // than the pixmap
-            if ( data->w * 2 > w || data->h * 2 > h ) {
-                QImage i = convertToImage();
-                pm = QPixmap( i.smoothScale( w, h ) );
-            } else
+                // do smooth resize until icon is two or more times bigger
+                // than the pixmap
+                if ( data->w * 2 > w || data->h * 2 > h ) {
+                    pm = QPixmap( i.smoothScale( w, h ) );
+                } else
 #endif
-            {
-                pm = QPixmap( w, h );
-                POINTL ptls[] = {
-                    { 0, 0 }, { w, h },
-                    { 0, 0 }, { data->w, data->h },
-                };
-                GpiBitBlt( pm.hps, hps, 4, ptls, ROP_SRCCOPY, BBO_IGNORE );
+                {
+                    pm = QPixmap( i.scale( w, h ) );
+                }
+                // correct the hot spot
+                hotX = hotX * w / data->w;
+                hotY = hotY * h / data->h;
             }
         }
@@ -1092 +1126 @@
         GpiSetBitmap( pm.hps, 0 );        
         GpiSetBitmap( msk.hps, 0 );
+        
+        // Due to a bug in WinCreatePointerIndirect, it always ignores
+        // hbmMiniPointer and hbmMiniColor fields, so we use only hbmPointer
+        // and hbmColor. Thankfully, PM will assign it correctly either to
+        // the "normal" or to the "mini" slot depending on the actual icon
+        // width and height. 
         
         POINTERINFO info;
@@ -1291 +1331 @@
     Creates an OS/2 icon or pointer from two given pixmaps.
     
+    If either of the pixmaps doesn't match eaxctly to the system-defined icon
+    or pointer size, it will be scaled to that size without keeping proportions.
+    However, to avoid scaling of small pixmaps that will most likely make them
+    unreadable, there is a non-scalable threshold that causes a pixmap to be
+    centered rather than scaled. The non-scalable threshold value is 1/4 of the
+    system-defined size but no more than 12 pixels (if more, then the threshold
+    is not applied). Here are examples of non-scalable pixmap sizes for common
+    icon/pointer sizes: 
+    
+    icon size         non-scalable pixmap sizes
+    ---------         -------------------------
+    16 px             12..16 px 
+    20 px             15..20 px 
+    32 px             24..32 px 
+    40 px             30..40 px 
+    
     \param pointer true to create a pointer, false to create an icon
     \param hotX X coordinate of the action point within the pointer/icon
     \param hotY Y coordinate of the action point within the pointer/icon
     \param normal pixmap for a normal-sized pointer/icon
-    \param mini pixmap for a mini-sized pointer/icon
+    \param mini pixmap for a mini-sized (half-sized) pointer/icon
     
     \return PM handle of the created pointer or 0 in case of any error
     
-    \note Due to a bug in WinCreatePointerIndirect, you can specify either
-    \a normal pixmap or \a mini pixmap, but not both (if both are specified,
-    \a normal will be used). PM will use scaling to draw a pointer of the
-    other size when necessary. This bug may be fixed later.
+    \note Due to a bug in WinCreatePointerIndirect, you can specify either a
+    \a normal pixmap or \a mini pixmap, but not both. If both are specified,
+    the \a normal will be used so that if its size is equal to or larger than
+    the normal pointer/icon size (taking the threshold into account), it will
+    be used as a normal pointer/icon, otherwise as a mini one. PM will use
+    its own scaling to draw a pointer/icon of the other size when necessary.
+    This bug may be fixed later.
     
     \warning This function is not portable.    
@@ -1312 +1371 @@
     // Due to a bug in WinCreatePointerIndirect (it always ignores
     // hbmMiniPointer and hbmMiniColor fields), we can specify either a normal
-    // icon, but not both. This methods still accepts pixmaps for both icon
+    // icon, but not both. This method still accepts pixmaps for both icon
     // sizes (assuming that we will find a workaround one day) but uses only
     // one of them.
     
     if ( normal && !normal->isNull() ) {
-#ifdef QT_CHECK_RANGE
-        if ( mini && !mini->isNull() )
-            qWarning( "QPixmap::createIcon(): due to a bug in WinCreatePointerIndirect "
-                      "either a normal or a mini pixmap should be specified, "
-                      "but not both. Will use a normal pixmap." );
-#endif    
-        return const_cast <QPixmap *> (normal)->createIcon( pointer, hotX, hotY, false );
+        // If the specified normal pixmap is equal to or larger than the normal
+        // icon size (taking the threshold into account), then we use it to
+        // create a normal icon, otherwise a mini one.
+        int w = WinQuerySysValue( HWND_DESKTOP, pointer ? SV_CXPOINTER : SV_CXICON );
+        int h = WinQuerySysValue( HWND_DESKTOP, pointer ? SV_CYPOINTER : SV_CYICON );
+#if !defined(QT_PM_NO_ICON_THRESHOLD)
+        // apply the threshold (see private QPixmap::createIcon() above)
+        if ( w / 4 <= 12 ) w -= w / 4;
+        if ( h / 4 <= 12 ) h -= h / 4;
+#endif        
+        bool mini = normal->width() < w && normal->height() < h;
+        return const_cast <QPixmap *> (normal)->createIcon( pointer, hotX, hotY, mini );
     }
     
     if ( mini && !mini->isNull() )
-        return const_cast <QPixmap *> (mini)->createIcon( pointer, hotX, hotY, true );
+        return const_cast <QPixmap *> (mini)->createIcon( pointer, hotX, hotY, TRUE );
     
     return 0;

trunk/src/kernel/qwidget_pm.cpp

@@ -1342 +1342 @@
     if ( !pixmap.isNull() ) {                   // valid icon
         x->icon = new QPixmap( pixmap );
-        
-        if ( isTopLevel() ) {
-            const QPixmap *normal = 0;
-            const QPixmap *mini = 0;
-            
-            // QPixmap::createIcon() is not yet capable to create both normal
-            // and mini icons (due to a bug in WinCreateIconIndirect), so
-            // if the specified pixmap is equal or larger than the normal icon
-            // size, then we create a normal icon, otherwise a mini one.
-            
-            int iconw = WinQuerySysValue( HWND_DESKTOP, SV_CXICON );
-            int iconh = WinQuerySysValue( HWND_DESKTOP, SV_CYICON );
-            if ( pixmap.width() >= iconw && pixmap.height() >= iconh ) {
-                normal = &pixmap;
-            } else {
-                mini = &pixmap;
-            }
-            
-            x->pmIcon = QPixmap::createIcon( false, 0, 0, normal, mini );
-        }
+        if ( isTopLevel() )
+            x->pmIcon = QPixmap::createIcon( FALSE, 0, 0, &pixmap, &pixmap );
     }