Changeset 59

Timestamp:

03/30/08 22:04:08 (7 months ago)

Author:

Chris Miller

Message:

Added ImageList?.images.addStrip.
More ToolBar? changes.

Files:

• trunk/win32/dfl/imagelist.d (modified) (5 diffs)
• trunk/win32/dfl/internal/winapi.d (modified) (1 diff)
• trunk/win32/dfl/toolbar.d (modified) (4 diffs)

trunk/win32/dfl/imagelist.d

@@ -34 +34 @@
-        
-        
+        final void addStrip(Image img)
+        {
+            HGDIOBJ hgo;
+            if(1 != img._imgtype(&hgo))
+            {
+                debug
+                {
+                    assert(0, "Image list: addStrip needs bitmap");
+                }
+                _unableimg();
+            }
+            
+            auto sz = imageSize;
+            if(img.height != sz.height
+                || img.width % sz.width)
+            {
+                debug
+                {
+                    assert(0, "Image list: invalid image size");
+                }
+                _unableimg();
+            }
+            int num = img.width / sz.width;
+            
+            /+
+            if(1 == num)
+            {
+                add(img);
+                return;
+            }
+            +/
+            
+            auto _hdl = handle; // _addhbitmap needs the handle! Could avoid this in the future.
+            _addhbitmap(hgo);
+            
+            int x = 0;
+            for(; num; num--)
+            {
+                auto sp = new StripPart();
+                sp.origImg = img;
+                sp.hbm = hgo;
+                sp.partBounds = Rect(x, 0, sz.width, sz.height);
+                
+                _images ~= sp;
+                
+                x += sz.width;
+            }
+        }
+        
+        
-        package:
-        
-        Image[] _images;
+        
+        
+        static class StripPart: Image
+        {
+            override Size size() // getter
+            {
+                return partBounds.size;
+            }
+            
+            
+            override void draw(Graphics g, Point pt)
+            {
+                HDC memdc;
+                memdc = CreateCompatibleDC(g.handle);
+                try
+                {
+                    HGDIOBJ hgo;
+                    hgo = SelectObject(memdc, hbm);
+                    BitBlt(g.handle, pt.x, pt.y, partBounds.width, partBounds.height, memdc, partBounds.x, partBounds.y, SRCCOPY);
+                    SelectObject(memdc, hgo); // Old bitmap.
+                }
+                finally
+                {
+                    DeleteDC(memdc);
+                }
+            }
+            
+            
+            override void drawStretched(Graphics g, Rect r)
+            {
+                HDC memdc;
+                memdc = CreateCompatibleDC(g.handle);
+                try
+                {
+                    HGDIOBJ hgo;
+                    int lstretch;
+                    hgo = SelectObject(memdc, hbm);
+                    lstretch = SetStretchBltMode(g.handle, COLORONCOLOR);
+                    StretchBlt(g.handle, r.x, r.y, r.width, r.height,
+                        memdc, partBounds.x, partBounds.y, partBounds.width, partBounds.height, SRCCOPY);
+                    SetStretchBltMode(g.handle, lstretch);
+                    SelectObject(memdc, hgo); // Old bitmap.
+                }
+                finally
+                {
+                    DeleteDC(memdc);
+                }
+            }
+            
+            
+            Image origImg; // Hold this so the HBITMAP doesn't get collected.
+            HBITMAP hbm;
+            Rect partBounds;
+        }
-        
-        
@@ -146 +250 @@
-        assert(!isHandleCreated);
-        
+        assert(sz.width && sz.height);
+        
-        _w = sz.width;
-        _h = sz.height;
@@ -298 +404 @@
-    
-    
-void
+int
-    {
-        assert(isHandleCreated);
@@ -307 +413 @@
-        {
-            case 1:
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-                break;
-            
@@ -332 +426 @@
-        //if(-1 == result)
-        //  _unableimg();
+        return result;
+    }
+    
+    int _addhbitmap(HBITMAP hbm)
+    {
+        assert(isHandleCreated);
+        
+        COLORREF cr;
+        if(_transcolor == Color.empty
+            || _transcolor == Color.transparent)
+        {
+            cr = CLR_NONE; // ?
+        }
+        else
+        {
+            cr = _transcolor.toRgb();
+        }
+        return imageListAddMasked(_hil, cast(HBITMAP)hbm, cr);
-    }
-}

trunk/win32/dfl/internal/winapi.d

@@ -2088 +2088 @@
-        TB_BUTTONSTRUCTSIZE = WM_USER + 30,
-        TB_SETBUTTONSIZE = WM_USER + 31,
+        TB_AUTOSIZE = WM_USER + 33,
-        TB_SETIMAGELIST = WM_USER + 48,
-        TB_INSERTBUTTONW = WM_USER + 67,
-        TB_ADDBUTTONSW = WM_USER + 68,
+        TB_SETPADDING = WM_USER + 87,
-    }
-    

trunk/win32/dfl/toolbar.d

@@ -568 +568 @@
-        prevwproc(TB_BUTTONSTRUCTSIZE, TBBUTTON.sizeof, 0);
-        
+        //prevwproc(TB_SETPADDING, 0, MAKELPARAM(0, 0));
+        
-        if(_imglist)
-            prevwproc(TB_SETIMAGELIST, 0, cast(WPARAM)_imglist.handle);
@@ -575 +577 @@
-            _ins(idx, tbb);
-        }
+        
+        //prevwproc(TB_AUTOSIZE, 0, 0);
-    }
-    
@@ -619 +623 @@
-        if(dfl.internal.utf.useUnicode)
-        {
-
+
+
-            //prevwproc(TB_ADDBUTTONSW, 1, cast(LPARAM)&xtb);
-            lresult = prevwproc(TB_INSERTBUTTONW, idx, cast(LPARAM)&xtb);
@@ -625 +630 @@
-        else
-        {
-
+
+
-            //prevwproc(TB_ADDBUTTONSA, 1, cast(LPARAM)&xtb);
-            lresult = prevwproc(TB_INSERTBUTTONA, idx, cast(LPARAM)&xtb);