Changeset 57 for trunk

Timestamp:

Jan 19, 2006, 10:22:10 PM (20 years ago)

Author:

dmik

Message:

Implemented QWidget::setIcon().

Location:

trunk

Files:

• include/qwidget.h (modified) (2 diffs)
• src/kernel/qwidget.cpp (modified) (1 diff)
• src/kernel/qwidget_pm.cpp (modified) (2 diffs)

trunk/include/qwidget.h

@@ -946 +946 @@
     uint     opacity : 8;                      // Stores opacity level on Windows/Mac OS X.
 #endif
-//@@TODO (dmik): savedFlags seems not to be used by OS/2 version. enclose it with ifndef?
+#if !defined(Q_WS_PM)
     uint     savedFlags;                        // Save widgetflags while showing fullscreen
+#endif    
     short    basew, baseh;                      // base sizes
 #if defined(Q_WS_X11)
@@ -974 +975 @@
     WId      fId;                               // frame window handle
     HSWITCH  swEntry;                           // window list entry handle
+    HPOINTER pmIcon;                            // internal OS/2 icon
 #endif
     QRect    normalGeometry;                    // used by showMin/maximized/FullScreen

trunk/src/kernel/qwidget.cpp

@@ -1130 +1130 @@
         x->ussize = 0;
 #endif
+#if !defined(Q_WS_PM)
         x->savedFlags = 0;
+#endif        
 #if defined(Q_WS_QWS) && !defined(QT_NO_QWS_MANAGER)
         x->decor_allocated_region = QRegion();

trunk/src/kernel/qwidget_pm.cpp

@@ -769 +769 @@
 }
 
-//@@TODO (dmik): later
-///*
-//  Create an icon mask the way Windows wants it using CreateBitmap.
-//*/
-//
-//HBITMAP qt_createIconMask( const QBitmap &bitmap )
-//{
-//    QImage bm = bitmap.convertToImage();
-//    int w = bm.width();
-//    int h = bm.height();
-//    int bpl = ((w+15)/16)*2;                  // bpl, 16 bit alignment
-//    uchar *bits = new uchar[bpl*h];
-//    bm.invertPixels();
-//    for ( int y=0; y<h; y++ )
-//      memcpy( bits+y*bpl, bm.scanLine(y), bpl );
-//    HBITMAP hbm = CreateBitmap( w, h, 1, 1, bits );
-//    delete [] bits;
-//    return hbm;
-//}
-
 void QWidget::setIcon( const QPixmap &pixmap )
 {
-    qWarning( "QWidget::setIcon() is not yet implemented on OS/2" );
-//@@TODO (dmik): later
-//    QTLWExtra* x = topData();
-//    delete x->icon;
-//    x->icon = 0;
-//    if ( x->winIcon ) {
-//      DestroyIcon( x->winIcon );
-//      x->winIcon = 0;
-//    }
-//    if ( !pixmap.isNull() ) {                 // valid icon
-//      QPixmap pm( pixmap.size(), pixmap.depth(), QPixmap::NormalOptim );
-//      QBitmap mask( pixmap.size(), FALSE, QPixmap::NormalOptim );
-//      if ( pixmap.mask() ) {
-//          pm.fill( black );                   // make masked area black
-//          bitBlt( &mask, 0, 0, pixmap.mask() );
-//      } else {
-//          mask.fill( color1 );
-//      }
-//      bitBlt( &pm, 0, 0, &pixmap );
-//      HBITMAP im = qt_createIconMask(mask);
-//      ICONINFO ii;
-//      ii.fIcon    = TRUE;
-//      ii.hbmMask  = im;
-//      ii.hbmColor = pm.hbm();
-//      ii.xHotspot = 0;
-//      ii.yHotspot = 0;
-//      x->icon = new QPixmap( pixmap );
-//      x->winIcon = CreateIconIndirect( &ii );
-//      DeleteObject( im );
-//    }
-//    SendMessageA( winId(), WM_SETICON, 0, /* ICON_SMALL */
-//                (long)x->winIcon );
-//    SendMessageA( winId(), WM_SETICON, 1, /* ICON_BIG */
-//                (long)x->winIcon );
-//
-//    QEvent e( QEvent::IconChange );
-//    QApplication::sendEvent( this, &e );
+    QTLWExtra* x = topData();
+    delete x->icon;
+    x->icon = 0;
+    HPOINTER oldIcon = x->pmIcon;
+    x->pmIcon = 0;
+    
+    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() )
+        WinSendMsg( x->fId, WM_SETICON, MPFROMLONG( x->pmIcon ), 0 );
+    
+    if ( oldIcon )
+        WinDestroyPointer( oldIcon ); 
+    
+    QEvent e( QEvent::IconChange );
+    QApplication::sendEvent( this, &e );
 }
 
@@ -1747 +1728 @@
 void QWidget::createTLSysExtra()
 {
-//@@TODO (dmik): remove?
-//    extra->topextra->winIcon = 0;
     extra->topextra->fId = 0;
     extra->topextra->swEntry = 0;
+    extra->topextra->pmIcon = 0;
 }
 
 void QWidget::deleteTLSysExtra()
 {
-    if ( extra->topextra->swEntry ) {
+    if ( extra->topextra->pmIcon )
+        WinDestroyPointer( extra->topextra->pmIcon );
+    if ( extra->topextra->swEntry )
         WinRemoveSwitchEntry( extra->topextra->swEntry );
-    }
     // frame window (extra->topextra->fId) is destroyed in
     // destroy() if it exists
-//@@TODO (dmik): remove?
-//    if ( extra->topextra->winIcon )
-//      DestroyIcon( extra->topextra->winIcon );
 }