Changeset 61

Timestamp:

04/07/08 08:20:34 (6 months ago)

Author:

Chris Miller

Message:

Fixed Windows issue with GroupBox? font.
Other minor changes.

Files:

• trunk/win32/dfl/control.d (modified) (1 diff)
• trunk/win32/dfl/drawing.d (modified) (1 diff)
• trunk/win32/dfl/form.d (modified) (1 diff)
• trunk/win32/dfl/groupbox.d (modified) (2 diffs)
• trunk/win32/dfl/internal/winapi.d (modified) (1 diff)

trunk/win32/dfl/control.d

@@ -1543 +1543 @@
-    {
-        Font result;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-        return result;

trunk/win32/dfl/drawing.d

@@ -2088 +2088 @@
-        fillRectangle(color, r.x, r.y, r.width, r.height);
-    }
-    
-    
-    /// ditto

trunk/win32/dfl/form.d

@@ -1994 +1994 @@
-            if(visible)
-            {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-            }
-            

trunk/win32/dfl/groupbox.d

@@ -52 +52 @@
-        if(DEFTEXTHEIGHT_INIT == _defTextHeight)
-        {
-
+
+
-            _defTextHeight = _textHeight;
-        }
@@ -117 +118 @@
-        //msg.result = CallWindowProcA(buttonPrevWndProc, msg.hWnd, msg.msg, msg.wParam, msg.lParam);
-        msg.result = dfl.internal.utf.callWindowProc(buttonPrevWndProc, msg.hWnd, msg.msg, msg.wParam, msg.lParam);
+        
+        // Work around a Windows issue...
+        if(WM_PAINT == msg.msg)
+        {
+            auto hmuxt = GetModuleHandleA("uxtheme.dll");
+            if(hmuxt)
+            {
+                auto isAppThemed = cast(typeof(&IsAppThemed))GetProcAddress(hmuxt, "IsAppThemed");
+                if(isAppThemed && isAppThemed())
+                {
+                    char[] txt = text;
+                    if(txt.length)
+                    {
+                        auto openThemeData = cast(typeof(&OpenThemeData))GetProcAddress(hmuxt, "OpenThemeData");
+                        HTHEME htd;
+                        if(openThemeData
+                            && HTHEME.init != (htd = openThemeData(msg.hWnd, "Button")))
+                        {
+                            HDC hdc = cast(HDC)msg.wParam;
+                            //PAINTSTRUCT ps;
+                            bool gotdc = false;
+                            if(!hdc)
+                            {
+                                //hdc = BeginPaint(msg.hWnd, &ps);
+                                gotdc = true;
+                                hdc = GetDC(msg.hWnd);
+                            }
+                            try
+                            {
+                                scope g = new Graphics(hdc, false); // Not owned.
+                                auto f = font;
+                                scope tfmt = new TextFormat(TextFormatFlags.SINGLE_LINE);
+                                
+                                Color c;
+                                COLORREF cr;
+                                auto getThemeColor = cast(typeof(&GetThemeColor))GetProcAddress(hmuxt, "GetThemeColor");
+                                if(getThemeColor
+                                    && 0 == getThemeColor(htd, 4 /*BP_GROUPBOX*/, 1 /*PBS_NORMAL*/, 3803 /*TMT_TEXTCOLOR*/, &cr))
+                                    c = Color.fromRgb(cr);
+                                else
+                                    c = foreColor;
+                                
+                                Size tsz = g.measureText(txt, f, tfmt);
+                                
+                                g.fillRectangle(backColor, 8, 0, 2 + tsz.width + 2, tsz.height + 2);
+                                g.drawText(txt, f, c, Rect(8 + 2, 0, tsz.width, tsz.height), tfmt);
+                            }
+                            finally
+                            {
+                                //if(ps.hdc)
+                                //  EndPaint(msg.hWnd, &ps);
+                                if(gotdc)
+                                    ReleaseDC(msg.hWnd, hdc);
+                                
+                                auto closeThemeData = cast(typeof(&CloseThemeData))GetProcAddress(hmuxt, "CloseThemeData");
+                                assert(closeThemeData !is null);
+                                closeThemeData(htd);
+                            }
+                        }
+                    }
+                }
+            }
+        }
-    }
-    

trunk/win32/dfl/internal/winapi.d

@@ -2951 +2951 @@
-    DWORD GetThemeAppProperties();
-    BOOL IsAppThemed();
+    HTHEME OpenThemeData(HWND hwnd, LPCWSTR pszClassList);
+    HRESULT CloseThemeData(HTHEME hTheme);
+    HRESULT GetThemeColor(HTHEME hTheme, int iPartId, int iStateId, int iPropId, COLORREF *pColor);
-    HIMAGELIST ImageList_Create(int cx, int cy, UINT flags, int cInitial, int cGrow);
-    BOOL ImageList_Destroy(HIMAGELIST himl);