Changeset 18

Timestamp:

02/18/08 01:43:59 (7 months ago)

Author:

Chris Miller

Message:

Fixed mnemonic (control/menu) issues.

Files:

• trunk/win32/dfl/button.d (modified) (1 diff)
• trunk/win32/dfl/control.d (modified) (2 diffs)
• trunk/win32/dfl/form.d (modified) (3 diffs)
• trunk/win32/dfl/label.d (modified) (1 diff)

trunk/win32/dfl/button.d

@@ -231 +231 @@
-        //return GetDlgCtrlID(m.hWnd) == IDOK;
-        return isdef;
+    }
+    
+    
+    protected override bool processMnemonic(dchar charCode)
+    {
+        if(canSelect)
+        {
+            if(isMnemonic(charCode, text))
+            {
+                select();
+                //performClick();
+                onClick(EventArgs.empty);
+                return true;
+            }
+        }
+        return false;
-    }
-    

trunk/win32/dfl/control.d

@@ -3710 +3710 @@
-            return;
-        
+        // To-do: check if correct implementation.
-        Control ctrl;
-
-directed
-
-SendMessageA(hwnd, WM_NEXTDLGCTL, !forward, MAKELPARAM(false, 0)); // TODO: fix..
-/+
-ctrl = Control.fromChildHandle(GetFocus());
-if(ctrl)
-{
-   ctrl = getNextControl(ctrl, forward, true);
-   if(ctrl
-       ctrl.select();
-}
-+/
+ctrl = findForm();
+ctrl && ctrl !is this
+
+// Even if directed, ensure THIS one is selected first
+if(!directed || hwnd != GetFocus())
+{
+   DefDlgProcA(ctrl.handle, WM_NEXTDLGCTL, cast(WPARAM)hwnd, MAKELPARAM(true, 0));
+}
+
+if(directed
+{
+   DefDlgProcA(ctrl.handle, WM_NEXTDLGCTL, !forward, MAKELPARAM(false, 0));
+}
-        }
-        else
-        {
-
-
-
-
-
-
-
-
-
-
+
-        }
-    }
@@ -6530 +6522 @@
-    
-    
-+
-deprecated 
+//
+
-    {
-        return false;
-    }
-
+
+
+
+
+
+
-    
-    

trunk/win32/dfl/form.d

@@ -2743 +2743 @@
-                                return false;
-                            
+                            case Keys.UP, Keys.DOWN:
+                            case Keys.RIGHT, Keys.LEFT:
+                                if(dfl.internal.utf.isDialogMessage(form.handle, &m._winMsg))
+                                    return true; // Prevent.
+                                return false; // Continue.
+                            
-                            case Keys.TAB:
-                                {
@@ -2791 +2797 @@
-                }
-                
+                /+
-                switch(m.msg)
-                {
@@ -2815 +2822 @@
-                        return true; // Prevent.
-                }
+                +/
+                switch(m.msg)
+                {
+                    case WM_SYSCHAR:
+                        {
+                            LRESULT dlgc;
+                            dlgc = SendMessageA(m.hWnd, WM_GETDLGCODE, 0, 0);
+                            if(dlgc & DLGC_WANTALLKEYS)
+                                return false; // Continue.
+                            
+                            size_t xiter;
+                            bool _eachild(HWND hw, bool delegate(HWND hw) callback)
+                            {
+                                for(; hw; hw = GetWindow(hw, GW_HWNDNEXT))
+                                {
+                                    if(!xiter)
+                                        return false;
+                                    xiter--;
+                                    
+                                    LONG st = GetWindowLongA(hw, GWL_STYLE);
+                                    if(!(st & WS_VISIBLE))
+                                        continue;
+                                    if(st & WS_DISABLED)
+                                        continue;
+                                    
+                                    if(!callback(hw))
+                                        return false;
+                                    
+                                    LONG exst = GetWindowLongA(hw, GWL_EXSTYLE);
+                                    if(exst & WS_EX_CONTROLPARENT)
+                                    {
+                                        HWND hwc = GetWindow(hw, GW_CHILD);
+                                        if(hwc)
+                                        {
+                                            if(!_eachild(hwc, callback))
+                                                return false;
+                                        }
+                                    }
+                                }
+                                return true;
+                            }
+                            
+                            void eachGoodChild(bool delegate(HWND hw) callback)
+                            {
+                                HWND hw = GetWindow(form.handle, GW_CHILD);
+                                xiter = 2000;
+                                _eachild(hw, callback);
+                            }
+                            
+                            bool pmnemonic(HWND hw)
+                            {
+                                Control cc = Control.fromHandle(hw);
+                                //printf("mnemonic for ");
+                                if(!cc)
+                                {
+                                    // To-do: check dlgcode for static/button and process.
+                                    return false;
+                                }
+                                //printf("'%.*s' ", cc.name);
+                                return cc._processMnemonic(cast(dchar)m.wParam);
+                            }
+                            
+                            bool foundmhw = false;
+                            bool foundmn = false;
+                            eachGoodChild(
+                                (HWND hw)
+                                {
+                                    if(foundmhw)
+                                    {
+                                        if(pmnemonic(hw))
+                                        {
+                                            foundmn = true;
+                                            return false; // Break.
+                                        }
+                                    }
+                                    else
+                                    {
+                                        if(hw == m.hWnd)
+                                            foundmhw = true;
+                                    }
+                                    return true; // Continue.
+                                });
+                            if(foundmn)
+                                return true; // Prevent.
+                            
+                            if(!foundmhw)
+                            {
+                                // Didn't find current control, so go from top-to-bottom.
+                                eachGoodChild(
+                                    (HWND hw)
+                                    {
+                                        if(pmnemonic(hw))
+                                        {
+                                            foundmn = true;
+                                            return false; // Break.
+                                        }
+                                        return true; // Continue.
+                                    });
+                            }
+                            else
+                            {
+                                // Didn't find mnemonic after current control, so go from top-to-this.
+                                eachGoodChild(
+                                    (HWND hw)
+                                    {
+                                        if(pmnemonic(hw))
+                                        {
+                                            foundmn = true;
+                                            return false; // Break.
+                                        }
+                                        if(hw == m.hWnd)
+                                            return false; // Break.
+                                        return true; // Continue.
+                                    });
+                            }
+                            if(foundmn)
+                                return true; // Prevent.
+                        }
+                        break;
+                    
+                    default: ;
+                }
-            }
-            

trunk/win32/dfl/label.d

@@ -361 +361 @@
-    
-    
+    protected override bool processMnemonic(dchar charCode)
+    {
+        if(visible && enabled)
+        {
+            if(isMnemonic(charCode, text))
+            {
+                select(true, true);
+                return true;
+            }
+        }
+        return false;
+    }
+    
+    
-    private:
-    TextFormat _tfmt;