Changeset 34

Timestamp:

02/23/08 03:25:14 (6 months ago)

Author:

Chris Miller

Message:

Changed dialog processing.

Files:

• trunk/win32/dfl/button.d (modified) (1 diff)
• trunk/win32/dfl/control.d (modified) (10 diffs)
• trunk/win32/dfl/form.d (modified) (13 diffs)

trunk/win32/dfl/button.d

@@ -211 +211 @@
-    final void isDefault(bool byes) // setter
-    {
-        if(byes)
-        {
-            if(isHandleCreated)
-                SetWindowLongA(handle, GWL_ID, IDOK);
-        }
-        else
-        {
-            if(isHandleCreated)
-                SetWindowLongA(handle, GWL_ID, 0);
-        }
-        
-        isdef = byes;
-    }

trunk/win32/dfl/control.d

@@ -1290 +1290 @@
-    
-    
+    package final bool _hasSelStyle()
+    {
+        return getStyle(ControlStyles.SELECTABLE);
+    }
+    
+    
-    ///
-    // Returns true if this control has the mouse capture.
@@ -3767 +3773 @@
-    
-    
-HWND hw
+Form 
-        bool tabStopOnly = true, bool selectableOnly = false,
-        bool nested = true, bool wrap = true,
-        HWND hwchildrenof = null)
-    {
+        //assert(cast(Form)Control.fromHandle(hwdlg) !is null);
+        
-        if(!hwchildrenof)
-hwdlg
+dlg.handle
-        if(forward)
-        {
@@ -3794 +3802 @@
-                                if(foundthis)
-                                {
-
+
+
-                                    tdone = true;
-                                    return false; // Break.
@@ -3813 +3822 @@
-                if(wrap || !foundthis)
-                {
-
+
+
-                }
-            }
@@ -3844 +3854 @@
-            // If it falls through without finding hwcursel, let it select the last one, even if not wrapping.
-            if(HWND.init != hwprev)
-
-
-
-
-
-
+
+
+
+
+
+
+
-        Control ctrl, bool forward, bool tabStopOnly, bool nested, bool wrap)
-    {
@@ -3858 +3869 @@
-        assert(ctrltoplevel.isHandleCreated);
-        
-.handle
+
-            (ctrl && ctrl.isHandleCreated) ? ctrl.handle : null,
-            forward, tabStopOnly, !tabStopOnly, nested, wrap,
@@ -3865 +3876 @@
-    
-    
+    package final void _selectThisControl()
+    {
+        
+    }
+    
+    
-    // Only considers child controls of this control.
-    final void selectNextControl(Control ctrl, bool forward, bool tabStopOnly, bool nested, bool wrap)
@@ -3871 +3888 @@
-            return;
-        
-
-
+
-        if(ctrltoplevel)
-            return _selectNextControl(ctrltoplevel, ctrl, forward, tabStopOnly, nested, wrap);
@@ -3894 +3910 @@
-            return;
-        
-
-
+
-        if(ctrltoplevel && ctrltoplevel !is this)
-        {
@@ -3913 +3928 @@
-            if(directed)
-            {
-.handle
+
-            }
-            else
-            {
-
-
+
-            }
-        }

trunk/win32/dfl/form.d

@@ -1838 +1838 @@
-            if(isMdiChild)
-            {
+                // Good, make sure client window proc handles it too.
-                SendMessageA(mdiParent.mdiClient.handle, WM_MDIACTIVATE, cast(WPARAM)handle, 0);
-                return;
@@ -1874 +1875 @@
-            {
-                cbits |= CBits.NOCLOSING;
-
+
+
-                //if(!visible)
-                if(!wmodal)
@@ -2213 +2215 @@
-                        if(acceptBtn)
-                        {
-
+
+
-                            return;
-                        }
@@ -2222 +2225 @@
-                        if(cancelBtn)
-                        {
-
+
+
-                            return;
-                        }
@@ -2515 +2519 @@
-    
-    
+    package HWND _lastSel; // Last selected, excluding accept button!
+    package HWND _hadfocus; // Before being deactivated.
+    
+    
+    // Returns if there was a selection.
+    package final bool _selbefore()
+    {
+        bool wasselbtn = false;
+        if(_lastSel)
+        {
+            wasselbtn = true;
+            if(IsChild(this.hwnd, _lastSel))
+            {
+                auto lastctrl = Control.fromHandle(_lastSel);
+                if(lastctrl)
+                {
+                    auto lastibc = cast(IButtonControl)lastctrl;
+                    if(lastibc)
+                        lastibc.notifyDefault(false);
+                }
+            }
+        }
+        return wasselbtn;
+    }
+    
+    package final void _seldeactivate()
+    {
+        if(!_selbefore())
+        {
+            if(acceptButton)
+                acceptButton.notifyDefault(false);
+        }
+    }
+    
+    package final void _selafter(Control ctrl, bool wasselbtn)
+    {
+        _lastSel = _lastSel.init;
+        auto ibc = cast(IButtonControl)ctrl;
+        if(ibc)
+        {
+            if(acceptButton)
+            {
+                if(ibc !is acceptButton)
+                {
+                    acceptButton.notifyDefault(false);
+                    _lastSel = ctrl.hwnd;
+                }
+                //else don't set _lastSel to accept button.
+            }
+            else
+            {
+                _lastSel = ctrl.hwnd;
+            }
+            
+            ibc.notifyDefault(true);
+        }
+        else
+        {
+            if(wasselbtn) // Only do it if there was a different button; don't keep doing this.
+            {
+                if(acceptButton)
+                    acceptButton.notifyDefault(true);
+            }
+        }
+    }
+    
+    package final void _selactivate()
+    {
+        if(_lastSel)
+        {
+            Control ctrl = Control.fromChildHandle(_lastSel);
+            if(ctrl && ctrl._hasSelStyle())
+            {
+                auto ibc = cast(IButtonControl)ctrl;
+                if(ibc)
+                {
+                    //ibc.notifyDefault(true);
+                    ctrl.select();
+                    return;
+                }
+                ctrl.select();
+            }
+            else
+            {
+                SetFocus(ctrl.hwnd);
+            }
+        }
+        if(acceptButton)
+        {
+            acceptButton.notifyDefault(true);
+        }
+    }
+    
+    // Child can be nested at any level.
+    package final void _selectChild(Control ctrl)
+    {
+        if(ctrl.canSelect)
+        {
+            bool wasselbtn = _selbefore();
+            
+            // Need to do some things, like select-all for edit.
+            DefDlgProcA(this.hwnd, WM_NEXTDLGCTL, cast(WPARAM)ctrl.hwnd, MAKELPARAM(true, 0));
+            
+            _selafter(ctrl, wasselbtn);
+        }
+    }
+    
+    package final void _selectChild(HWND hw)
+    {
+        Control ctrl = Control.fromHandle(hw);
+        if(ctrl)
+            _selectChild(ctrl);
+    }
+    
+    
-    private void _selonecontrol()
-    {
@@ -2571 +2690 @@
-                return;
-            
+            case WM_NEXTDLGCTL:
+                if(LOWORD(msg.lParam))
+                {
+                    _selectChild(cast(HWND)msg.wParam);
+                }
+                else
+                {
+                    _dlgselnext(this, GetFocus(), msg.wParam != 0);
+                }
+                return;
+            
-            case WM_ENABLE:
-                if(msg.wParam)
@@ -2580 +2710 @@
-                }
-                break;
+            
+            case WM_ACTIVATE:
+                switch(LOWORD(msg.wParam))
+                {
+                    case WA_ACTIVE:
+                    case WA_CLICKACTIVE:
+                        _selactivate();
+                        break;
+                    
+                    case WA_INACTIVE:
+                        _seldeactivate();
+                        _lastSel = GetFocus();
+                        break;
+                    
+                    default: ;
+                }
+                return;
-            
-            default:
@@ -2807 +2954 @@
-                                                case Keys.UP, Keys.LEFT:
-                                                    // Backwards...
-.handle
+
-                                                    break;
-                                                case Keys.DOWN, Keys.RIGHT:
-                                                    // Forwards...
-.handle
+
-                                                    break;
-                                                default:
@@ -2847 +2994 @@
-                                            // Backwards...
-                                            //DefDlgProcA(form.handle, WM_NEXTDLGCTL, 1, MAKELPARAM(FALSE, 0));
-.handle
+
-                                        }
-                                        else
@@ -2853 +3000 @@
-                                            // Forwards...
-                                            //DefDlgProcA(form.handle, WM_NEXTDLGCTL, 0, MAKELPARAM(FALSE, 0));
-.handle
+
-                                        }
-                                    }
@@ -2946 +3093 @@
-                        break;
-                    
+                    case WM_LBUTTONUP:
+                    case WM_MBUTTONUP:
+                    case WM_RBUTTONUP:
+                        if(m.hWnd != form.hwnd)
+                        {
+                            Control ctrl = Control.fromChildHandle(m.hWnd);
+                            if(ctrl.focused && ctrl.canSelect)
+                            {
+                                bool wasselbtn = form._selbefore();
+                                form._selafter(ctrl, wasselbtn);
+                            }
+                        }
+                        break;
+                    
-                    default: ;
-                }
@@ -2965 +3126 @@
-    
-    
+    /+
-    package final bool _dlgescape()
-    {
@@ -2974 +3136 @@
-        return false;
-    }
+    +/
-    
-