Changeset 57

Timestamp:

03/30/08 18:39:46 (5 months ago)

Author:

Chris Miller

Message:

More ToolBar? features.

Files:

• trunk/win32/dfl/internal/winapi.d (modified) (2 diffs)
• trunk/win32/dfl/toolbar.d (modified) (9 diffs)

trunk/win32/dfl/internal/winapi.d

@@ -2008 +2008 @@
-    
-    
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    
-    
-    enum: BYTE
-    {
+        TBSTYLE_BUTTON = 0x00,
+        TBSTYLE_SEP = 0x01,
+        TBSTYLE_CHECK = 0x02,
+        TBSTYLE_GROUP = 0x04,
+        TBSTYLE_DROPDOWN = 0x08,
+        TBSTYLE_AUTOSIZE = 0x10,
+        
+        /+
+        // The following are too big for TBBUTTON.fsStyle
+        TBSTYLE_TOOLTIPS = 0x0100,
+        TBSTYLE_WRAPABLE = 0x0200,
+        TBSTYLE_ALTDRAG = 0x0400,
+        +/
+    }
+    
+    
+    enum: BYTE
+    {
+        //BTNS_AUTOSIZE = TBSTYLE_AUTOSIZE,
+        
+        BTNS_WHOLEDROPDOWN = 0x80,
+    }
+    
+    
+    enum: BYTE
+    {
-        TBSTATE_ENABLED = 0x04,
-    }
-    
-    
-
-
-
-
+
+
+
+
+
-    }
-    
@@ -2032 +2077 @@
-        TB_INSERTBUTTONA = WM_USER + 21,
-        TB_DELETEBUTTON = WM_USER + 22,
+        TB_GETITEMRECT = WM_USER + 29,
-        TB_BUTTONSTRUCTSIZE = WM_USER + 30,
-        TB_SETIMAGELIST = WM_USER + 48,
-        TB_INSERTBUTTONW = WM_USER + 67,
-        TB_ADDBUTTONSW = WM_USER + 68,
+    }
+    
+    
+    enum: UINT
+    {
+        TBN_FIRST = cast(UINT)-700,
+        TBN_DROPDOWN = TBN_FIRST - 10,
-    }
-    

trunk/win32/dfl/toolbar.d

@@ -12 +12 @@
-{
-    private import dfl.imagelist;
+}
+
+version(DFL_TOOLBAR_NO_MENU)
+{
+}
+else
+{
+    private import dfl.menu;
+}
+
+
+///
+enum ToolBarButtonStyle: ubyte
+{
+    PUSH_BUTTON = TBSTYLE_BUTTON, ///
+    TOGGLE_BUTTON = TBSTYLE_CHECK, /// ditto
+    SEPARATOR = TBSTYLE_SEP, /// ditto
+    //DROP_DOWN_BUTTON = TBSTYLE_DROPDOWN, /// ditto
+    DROP_DOWN_BUTTON = TBSTYLE_DROPDOWN | BTNS_WHOLEDROPDOWN, /// ditto
-}
-
@@ -71 +90 @@
-    
-    
+    ///
+    final void style(ToolBarButtonStyle st) // setter
+    {
+        this._st = st;
+        
+        //if(tbar && tbar.created)
+        //  
+    }
+    
+    /// ditto
+    final ToolBarButtonStyle style() // getter
+    {
+        return _st;
+    }
+    
+    
-    override Dstring toString()
-    {
@@ -98 +133 @@
-    {
-        return stringICmp(text, val);
+    }
+    
+    
+    ///
+    final void tag(Object o) // setter
+    {
+        _tag = o;
+    }
+    
+    /// ditto
+    final Object tag() // getter
+    {
+        return _tag;
+    }
+    
+    
+    version(DFL_TOOLBAR_NO_MENU)
+    {
+    }
+    else
+    {
+        ///
+        final void dropDownMenu(ContextMenu cmenu) // setter
+        {
+            _cmenu = cmenu;
+        }
+        
+        /// ditto
+        final ContextMenu dropDownMenu() // getter
+        {
+            return _cmenu;
+        }
+    }
+    
+    
+    ///
+    final ToolBar parent() // getter
+    {
+        return tbar;
+    }
+    
+    
+    ///
+    final Rect rectangle() // getter
+    {
+        //if(!tbar || !tbar.created)
+        if(!visible)
+            return Rect(0, 0, 0, 0); // ?
+        assert(tbar !is null);
+        RECT rect;
+        //assert(-1 != tbar.buttons.indexOf(this));
+        tbar.prevwproc(TB_GETITEMRECT, tbar.buttons.indexOf(this), cast(LPARAM)&rect); // Fails if item is hidden.
+        return Rect(&rect); // Should return all 0`s if TB_GETITEMRECT failed.
+    }
+    
+    
+    ///
+    final bool visible() // getter
+    {
+        if(!tbar || !tbar.created)
+            return false;
+        return true; // To-do: get actual hidden state.
-    }
-    
@@ -103 +200 @@
-    private:
-    ToolBar tbar;
+    int _id = 0;
-    Dstring _text;
+    Object _tag;
+    ToolBarButtonStyle _st = ToolBarButtonStyle.PUSH_BUTTON;
+    version(DFL_TOOLBAR_NO_MENU)
+    {
+    }
+    else
+    {
+        ContextMenu _cmenu;
+    }
-    version(DFL_NO_IMAGELIST)
-    {
@@ -161 +268 @@
-        {
-            val.tbar = tbar;
+            val._id = tbar._allocTbbID();
-            
-            if(created)
@@ -180 +288 @@
-                    prevwproc(TB_DELETEBUTTON, idx, 0);
-                }
+                val.tbar = null;
-            }
-        }
@@ -294 +403 @@
-                            break;
-                        
+                        case TBN_DROPDOWN:
+                            version(DFL_TOOLBAR_NO_MENU) // This condition might be removed later.
+                            {
+                            }
+                            else // Ditto.
+                            {
+                                auto nmtb = cast(LPNMTOOLBARA)nmh; // NMTOOLBARA/NMTOOLBARW doesn't matter here; string fields not used.
+                                auto tbb = buttomFromID(nmtb.iItem);
+                                if(tbb)
+                                {
+                                    version(DFL_TOOLBAR_NO_MENU) // Keep this here in case the other condition is removed.
+                                    {
+                                    }
+                                    else // Ditto.
+                                    {
+                                        if(tbb._cmenu)
+                                        {
+                                            auto brect = tbb.rectangle;
+                                            tbb._cmenu.show(this, pointToScreen(Point(brect.x, brect.bottom)));
+                                            // Note: showing a menu also triggers a click!
+                                        }
+                                    }
+                                }
+                            }
+                            return TBDDRET_DEFAULT;
+                        
-                        default: ;
-                    }
@@ -319 +454 @@
-    
-    
+    
+    // Used internally
+    /+package+/ final ToolBarButton buttomFromID(int id) // package
+    {
+        foreach(tbb; _tbuttons._buttons)
+        {
+            if(id == tbb._id)
+                return tbb;
+        }
+        return null;
+    }
+    
+    
+    package int _lastTbbID = 0;
+    
+    package final int _allocTbbID()
+    {
+        for(int j = 0; j != 250; j++)
+        {
+            _lastTbbID++;
+            if(_lastTbbID >= short.max)
+                _lastTbbID = 1;
+            
+            if(!buttomFromID(_lastTbbID))
+                return _lastTbbID;
+        }
+        return 0;
+    }
+    
+    
+    
-    protected override void onHandleCreated(EventArgs ea)
-    {
@@ -369 +535 @@
-            xtb.iBitmap = tbb._imgidx;
-        }
-//xtb.idCommand = 42
+xtb.idCommand = tbb._id
-        xtb.dwData = cast(DWORD)cast(void*)tbb;
-        xtb.fsState = TBSTATE_ENABLED;
-BTNS_AUTOSIZE;
+TBSTYLE_AUTOSIZE | tbb._st; // TBSTYLE_AUTOSIZE factors in the text's width instead of default button size.
-        LRESULT lresult;
-        // MSDN says iString can be either an int offset or pointer to a string buffer.