Changeset 62

Timestamp:

04/07/08 19:04:18 (6 months ago)

Author:

Chris Miller

Message:

Minor changes.

Files:

• trunk/win32/dfl/control.d (modified) (8 diffs)
• trunk/win32/dfl/groupbox.d (modified) (1 diff)

trunk/win32/dfl/control.d

@@ -1776 +1776 @@
-    
-    
-
-
+
-    {
-        if(isHandleCreated)
-        {
-            if(byes == enabled)
-                return;
-            
-            EnableWindow(hwnd, byes);
-            // Window events will update -wstyle-.
@@ -1796 +1792 @@
-    }
-    
+    
+    ///
+    final void enabled(bool byes) // setter
+    {
+        if(byes)
+            cbits |= CBits.ENABLED;
+        else
+            cbits &= ~CBits.ENABLED;
+        
+        /+
+        if(!byes)
+        {
+            _venabled(false);
+        }
+        else
+        {
+            if(!parent || parent.enabled)
+                _venabled(true);
+        }
+        
+        _propagateEnabledAmbience();
+        +/
+        
+        _venabled(byes);
+    }
+    
-    ///
-    final bool enabled() // getter
@@ -1804 +1826 @@
-        
-        return (wstyle & WS_DISABLED) == 0;
+    }
+    
+    
+    private void _propagateEnabledAmbience()
+    {
+        /+ // Isn't working...
+        if(cbits & CBits.FORM)
+            return;
+        
+        bool en = enabled;
+        
+        void pa(Control pc)
+        {
+            foreach(Control ctrl; pc.ccollection)
+            {
+                if(ctrl.cbits & CBits.ENABLED)
+                {
+                    _venabled(en);
+                    
+                    pa(ctrl);
+                }
+            }
+        }
+        
+        pa(this);
+        +/
-    }
-    
@@ -2375 +2423 @@
-        Color foreColor;
-        RightToLeft rightToLeft;
+        //CBits cbits;
+        bool enabled;
-        
-        
@@ -2386 +2436 @@
-                foreColor = ctrl.foreColor;
-                rightToLeft = ctrl.rightToLeft;
+                //cbits = ctrl.cbits;
+                enabled = ctrl.enabled;
-            }
-            /+else
@@ -2394 +2446 @@
-                foreColor = Color.empty;
-                rightToLeft = RightToLeft.INHERIT;
+                //cbits = CBits.init;
+                enabled = true;
-            }+/
-        }
@@ -2454 +2508 @@
-            }
-        }
+        
+        /+
+        if(newinfo.enabled != oldinfo.enabled)
+        {
+            if(cbits & CBits.ENABLED)
+            {
+                _venabled(newinfo.enabled);
+                _propagateEnabledAmbience();
+            }
+        }
+        +/
-    }
-    
@@ -6856 +6921 @@
-        VSTYLE = 0x400000, // If not forced off.
-        FORMLOADED = 0x800000, // If not forced off.
+        ENABLED = 0x1000000, // Enabled state, not considering the parent.
-    }
-    
-    //CBits cbits = CBits.ALLOW_LAYOUT;
-    //CBits cbits = CBits.NONE;
-
+ | CBits.ENABLED
-    
-    

trunk/win32/dfl/groupbox.d

@@ -154 +154 @@
-                                COLORREF cr;
-                                auto getThemeColor = cast(typeof(&GetThemeColor))GetProcAddress(hmuxt, "GetThemeColor");
+                                auto gtcState = enabled ? (1 /*PBS_NORMAL*/) : (2 /*GBS_DISABLED*/);
-                                if(getThemeColor
-1 /*PBS_NORMAL*/
+gtcState
-                                    c = Color.fromRgb(cr);
-                                else
-foreColor;
+enabled ? foreColor : SystemColors.grayText; // ?
-                                
-                                Size tsz = g.measureText(txt, f, tfmt);