Changeset 1343 for trunk/src

Timestamp:

Oct 17, 1999, 9:32:05 PM (26 years ago)

Author:

cbratschi

Message:

DrawIcon/DrawIconEx, fixed other icon handling problems

Location:

trunk/src/user32

Files:

• button.cpp (modified) (4 diffs)
• pmframe.cpp (modified) (6 diffs)
• static.cpp (modified) (4 diffs)
• uitools.cpp (modified) (3 diffs)

trunk/src/user32/button.cpp

@@ -1 @@
-/* $Id: button.cpp,v 1.11 1999-10-16 11:05:37 sandervl Exp $ */
+/* $Id: button.cpp,v 1.12 1999-10-17 19:32:04 cbratschi Exp $ */
 /* File: button.cpp -- Button type widgets
  *
@@ -114 +114 @@
   DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
 
-//  PAINT_BUTTON(hwnd,dwStyle & 0x0f,ODA_DRAWENTIRE);
+  //PAINT_BUTTON(hwnd,dwStyle & 0x0f,ODA_DRAWENTIRE);
   //SvL: 09/10/99 Force it to redraw properly
   InvalidateRect( hwnd, NULL, FALSE );
@@ -167 +167 @@
   DWORD style = GetWindowLongA(hwnd,GWL_STYLE) & 0x0f;
 //  if(style == BS_GROUPBOX) {
-        return DefWindowProcA(hwnd, WM_ERASEBKGND, wParam, lParam);
+        return DefWindowProcA(hwnd, WM_ERASEBKGND, wParam, lParam);
 //  }
 //  return 1;
@@ -947 +947 @@
     /* assure that starting control is not disabled or invisible */
 //    start = sibling = GetNextDlgGroupItem( parent, hwnd, TRUE );
-    //@YD: bugfix       
+    //@YD: bugfix
     start = sibling = GetNextDlgGroupItem( parent, hwnd, FALSE );
     do

trunk/src/user32/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.7 1999-10-17 12:17:44 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.8 1999-10-17 19:32:04 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -92 +92 @@
 BOOL CanDrawSizeBox(Win32BaseWindow *win32wnd)
 {
-  return (!win32wnd->isChild() && WinQueryWindowULong(win32wnd->getOS2FrameWindowHandle(),QWL_STYLE) & FS_SIZEBORDER
+  return (win32wnd->getStyle() & WS_SIZEBOX_W && WinQueryWindowULong(win32wnd->getOS2FrameWindowHandle(),QWL_STYLE) & FS_SIZEBORDER
           && win32wnd->getVertScrollHandle() && WinQueryWindow(win32wnd->getVertScrollHandle(),QW_PARENT) == win32wnd->getOS2FrameWindowHandle()
           && win32wnd->getHorzScrollHandle() && WinQueryWindow(win32wnd->getHorzScrollHandle(),QW_PARENT) == win32wnd->getOS2FrameWindowHandle());
@@ -272 +272 @@
 
           GetSizeBox(win32wnd,&rect);
-          hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN);
+          hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
           DrawSizeBox(hps,rect);
           WinReleasePS(hps);
@@ -293 +293 @@
         rect.yTop = rect.yTop-rect.yBottom;
         rect.xLeft = rect.yBottom = 0;
-        hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN);
+        hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
         DrawFrame(hps,&rect,win32wnd);
         WinReleasePS(hps);
@@ -318 +318 @@
 
           GetSizeBox(win32wnd,&rect);
-          hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN);
+          hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
           DrawSizeBox(hps,rect);
           WinReleasePS(hps);
@@ -338 +338 @@
         rect.yTop = rect.yTop-rect.yBottom;
         rect.xLeft = rect.yBottom = 0;
-        hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN);
+        hps = WinGetClipPS(hwnd,0,PSF_CLIPCHILDREN | PSF_CLIPSIBLINGS);
         DrawFrame(hps,&rect,win32wnd);
         WinReleasePS(hps);

trunk/src/user32/static.cpp

@@ -1 @@
-/* $Id: static.cpp,v 1.4 1999-10-08 21:26:08 cbratschi Exp $ */
+/* $Id: static.cpp,v 1.5 1999-10-17 19:32:04 cbratschi Exp $ */
 /*
  * Static control
@@ -63 +63 @@
     STATICINFO *infoPtr = (STATICINFO *)GetInfoPtr(hwnd);
     DWORD dwStyle = GetWindowLongA(hwnd,GWL_STYLE);
-    INT cx,cy;
+    ICONINFO ii;
+    BITMAP bmp;
 
     if ((dwStyle & SS_TYPEMASK) != SS_ICON) return 0;
@@ -71 +72 @@
     infoPtr->hIcon = hicon;
 
-    cx = GetSystemMetrics(SM_CXICON);
-    cy = GetSystemMetrics(SM_CYICON);
-
-    SetWindowPos(hwnd,0,0,0,cx,cy,SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
+    GetIconInfo(hicon,&ii);
+    GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
+
+    SetWindowPos(hwnd,0,0,0,bmp.bmWidth,bmp.bmHeight,SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
 
     return prevIcon;
@@ -104 +105 @@
         SetWindowPos( hwnd, 0, 0, 0, bm.bmWidth, bm.bmHeight,
                       SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER );
-/* CB: alternative code, if necessary
-      HDC hdc = GetDC(hwnd);
-      BITMAPINFO info;
-
-      ZeroMemory(&info,sizeof(info));
-      if (GetDIBits(hdc,hbitmap,0,0,NULL,&info,0) != 0)
-      {
-        SetWindowPos(hwnd,0,0,0,info.bmiHeader.biWidth,info.bmiHeader.biHeight,SWP_NOACTIVATE | SWP_NOMOVE | SWP_NOZORDER);
-      }
-      ReleaseDC(hwnd,hdc);
-*/
-
     }
     return hOldBitmap;

trunk/src/user32/uitools.cpp

@@ -1 @@
-/* $Id: uitools.cpp,v 1.13 1999-10-12 14:47:22 sandervl Exp $ */
+/* $Id: uitools.cpp,v 1.14 1999-10-17 19:32:05 cbratschi Exp $ */
 /*
  * User Interface Functions
@@ -1762 +1762 @@
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API DrawIcon( HDC arg1, int arg2, int arg3, HICON  arg4)
-{
+BOOL WIN32API DrawIcon( HDC hDC, int X, int Y, HICON  hIcon)
+{
+  ICONINFO ii;
+  HDC hMemDC;
+  BITMAP bmp;
+  HBITMAP oldBmp;
+  COLORREF oldFg,oldBg;
+
 #ifdef DEBUG
-    WriteLog("USER32:  DrawIcon\n");
+  WriteLog("USER32:  DrawIcon\n");
 #endif
-    return O32_DrawIcon(arg1, arg2, arg3, arg4);
+
+  if (!hDC || !hIcon)
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+
+    return FALSE;
+  }
+
+  if (!GetIconInfo(hIcon,&ii)) return FALSE;
+  GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
+  oldFg = SetTextColor(hDC,RGB(0,0,0));
+  oldBg = SetBkColor(hDC,RGB(255,255,255));
+  hMemDC = CreateCompatibleDC(hDC);
+  oldBmp = SelectObject(hMemDC,ii.hbmMask);
+  BitBlt(hDC,X,Y,bmp.bmWidth,bmp.bmHeight,hMemDC,0,0,SRCAND);
+  SelectObject(hMemDC,ii.hbmColor);
+  BitBlt(hDC,X,Y,bmp.bmWidth,bmp.bmHeight,hMemDC,0,0,SRCPAINT);
+  SelectObject(hMemDC,ii.hbmMask);
+  BitBlt(hDC,X,Y,bmp.bmWidth,bmp.bmHeight,hMemDC,0,bmp.bmHeight,SRCINVERT);
+  SelectObject(hMemDC,oldBmp);
+  DeleteObject(hMemDC);
+  SetTextColor(hDC,oldFg);
+  SetBkColor(hDC,oldBg);
+
+  return TRUE;
 }
 //******************************************************************************
 //******************************************************************************
-BOOL WIN32API DrawIconEx(HDC hdc, int xLeft, int xRight, HICON hIcon,
+BOOL WIN32API DrawIconEx(HDC hdc, int xLeft, int yTop, HICON hIcon,
                          int cxWidth, int cyWidth, UINT istepIfAniCur,
                          HBRUSH hbrFlickerFreeDraw, UINT diFlags)
 {
+  ICONINFO ii;
+  HDC hMemDC;
+  BITMAP bmp;
+  HBITMAP oldBmp;
+  COLORREF oldFg,oldBg;
+  INT oldStretchMode;
+
 #ifdef DEBUG
-    WriteLog("USER32:  DrawIcon, partially implemented\n");
+  WriteLog("USER32:  DrawIconEx\n");
 #endif
-    return O32_DrawIcon(hdc, xLeft, xRight, hIcon);
+
+  //CB: istepIfAniCur, DI_COMPAT ignored
+
+  if (!hdc || !hIcon)
+  {
+    SetLastError(ERROR_INVALID_PARAMETER);
+
+    return FALSE;
+  }
+
+  if (!GetIconInfo(hIcon,&ii)) return FALSE;
+  GetObjectA(ii.hbmColor,sizeof(BITMAP),(LPVOID)&bmp);
+
+  /* Calculate the size of the destination image.  */
+  if (cxWidth == 0)
+  {
+    if (diFlags & DI_DEFAULTSIZE)
+      cxWidth = GetSystemMetrics(SM_CXICON);
+    else
+      cxWidth = bmp.bmWidth;
+  }
+  if (cyWidth == 0)
+  {
+    if (diFlags & DI_DEFAULTSIZE)
+      cyWidth = GetSystemMetrics(SM_CYICON);
+    else
+      cyWidth = bmp.bmHeight;
+  }
+
+  if (hbrFlickerFreeDraw)
+  {
+    HDC hBmpDC = CreateCompatibleDC(hdc);
+    HBITMAP memBmp,oldMemBmp = CreateCompatibleBitmap(hdc,cxWidth,cyWidth);
+    RECT rect;
+
+    oldMemBmp = SelectObject(hBmpDC,memBmp);
+    rect.left = 0;
+    rect.top = 0;
+    rect.right = cxWidth;
+    rect.bottom = cyWidth;
+    FillRect(hBmpDC,&rect,hbrFlickerFreeDraw);
+    oldFg = SetTextColor(hBmpDC,RGB(0,0,0));
+    oldBg = SetBkColor(hBmpDC,RGB(255,255,255));
+    hMemDC = CreateCompatibleDC(hdc);
+    oldBmp = SelectObject(hMemDC,ii.hbmMask);
+    oldStretchMode = SetStretchBltMode(hBmpDC,STRETCH_DELETESCANS);
+    StretchBlt(hBmpDC,0,0,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCAND);
+    SelectObject(hMemDC,ii.hbmColor);
+    StretchBlt(hBmpDC,0,0,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCPAINT);
+    SelectObject(hMemDC,ii.hbmMask);
+    StretchBlt(hBmpDC,0,0,cxWidth,cyWidth,hMemDC,0,bmp.bmHeight,bmp.bmWidth,bmp.bmHeight,SRCINVERT);
+    BitBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hBmpDC,0,0,SRCCOPY);
+    SelectObject(hMemDC,oldBmp);
+    DeleteObject(hMemDC);
+    SetTextColor(hdc,oldFg);
+    SetBkColor(hdc,oldBg);
+    SetStretchBltMode(hBmpDC,oldStretchMode);
+    SelectObject(hBmpDC,oldMemBmp);
+    DeleteObject(hBmpDC);
+    DeleteObject(memBmp);
+  } else
+  {
+    oldFg = SetTextColor(hdc,RGB(0,0,0));
+    oldBg = SetBkColor(hdc,RGB(255,255,255));
+    hMemDC = CreateCompatibleDC(hdc);
+    oldBmp = SelectObject(hMemDC,ii.hbmMask);
+    oldStretchMode = SetStretchBltMode(hdc,STRETCH_DELETESCANS);
+    StretchBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCAND);
+    SelectObject(hMemDC,ii.hbmColor);
+    StretchBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hMemDC,0,0,bmp.bmWidth,bmp.bmHeight,SRCPAINT);
+    SelectObject(hMemDC,ii.hbmMask);
+    StretchBlt(hdc,xLeft,yTop,cxWidth,cyWidth,hMemDC,0,bmp.bmHeight,bmp.bmWidth,bmp.bmHeight,SRCINVERT);
+    SelectObject(hMemDC,oldBmp);
+    DeleteObject(hMemDC);
+    SetTextColor(hdc,oldFg);
+    SetBkColor(hdc,oldBg);
+    SetStretchBltMode(hdc,oldStretchMode);
+  }
+
+  return TRUE;
 }
 //******************************************************************************
@@ -1789 +1905 @@
     if(!window) {
         dprintf(("DrawMenuBar, window %x not found", hwnd));
-        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
+        SetLastError(ERROR_INVALID_WINDOW_HANDLE);
         return 0;
     }