Changeset 218:c749c13479ef

Timestamp:

05/18/08 13:57:18 (3 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

rebuild some function to work again with heap RECT. Also some overrides

Files:

• dwt/widgets/Tree.d (modified) (41 diffs)
• dwt/widgets/TreeColumn.d (modified) (2 diffs)
• dwt/widgets/TreeItem.d (modified) (10 diffs)

dwt/widgets/Tree.d

@@ -480 +480 @@
-                    if (explorerTheme) {
-                        if (hooks (DWT.EraseItem)) {
-
+*
-                            itemRect.left -= EXPLORER_EXTRA;
-                            itemRect.right += EXPLORER_EXTRA + 1;
@@ -522 +522 @@
-        }
-        if (x + width > clientRect.left) {
-
-
-
-
+
+
-            if (i is 0) {
-                drawItem = drawImage = drawText = false;
@@ -545 +543 @@
-                                    data.device = display;
-                                    GC gc = GC.win32_new (hDC, data);
-
+*
-                                    gc.setClipping (iconRect.left, iconRect.top, iconRect.right - iconRect.left, iconRect.bottom - iconRect.top);
-                                    gc.drawImage (image, 0, 0, bounds.width, bounds.height, iconRect.left, iconRect.top, size.x, size.y);
@@ -554 +552 @@
-                        }
-                    } else {
-
+_
-                        rect = item.getBounds (index, true, false, false, false, true, hDC);
-                        if (linesVisible) {
@@ -563 +561 @@
-                }
-                if (selected && !ignoreDrawSelection && !ignoreDrawBackground) {
-&
-
-
-&
+
+_
+
+
-                if (hooks (DWT.EraseItem)) {
-                    drawItem = drawText = drawImage = true;
-                    rect = item.getBounds (index, true, true, false, false, true, hDC);
-                    if ((style & DWT.FULL_SELECTION) !is 0) {
-&
+
-                    } else {
-
-
+
-                    }
-                }
@@ -580 +577 @@
-                selectionForeground = -1;
-                ignoreDrawForeground = ignoreDrawBackground = ignoreDrawSelection = ignoreDrawFocus = ignoreDrawHot = false;
-&
-&
+
+
-            }
-            int clrText = -1, clrTextBk = -1;
@@ -592 +589 @@
-                        OS.SetTextColor (hDC, getForegroundPixel ());
-                        OS.SetBkColor (hDC, getBackgroundPixel ());
-
+_
-                    }
-                } else {
-
+_
-                }
-                if (drawForeground) {
@@ -601 +598 @@
-                    if (clrText is -1) clrText = item.foreground;
-                }
-
+_
-                    clrTextBk = item.cellBackground !is null ? item.cellBackground [index] : -1;
-                    if (clrTextBk is -1) clrTextBk = item.background;
@@ -608 +605 @@
-            } else {
-                if (clrTextBk is -1 && index is sortIndex) {
-
+_
-                    clrTextBk = clrSortBk;
-                }
@@ -615 +612 @@
-                if (selected || (nmcd.nmcd.uItemState & OS.CDIS_HOT) !is 0) {
-                    if ((style & DWT.FULL_SELECTION) !is 0) {
-
+_
-                    } else {
-                        if (i is 0) {
-
+_
-                            if (!hooks (DWT.EraseItem)) drawText = false;
-                        }
@@ -631 +628 @@
-                    }
-                    if (hooks (DWT.EraseItem)) {
-
+*
-                        int nSavedDC = OS.SaveDC (hDC);
-                        GCData data = new GCData ();
@@ -693 +690 @@
-                                } else {
-                                    if (!explorerTheme) {
-
+_
-                                        ignoreDrawBackground = false;
-                                        if ((handle is OS.GetFocus () || display.getHighContrast ()) && OS.IsWindowEnabled (handle)) {
@@ -754 +751 @@
-                if (!ignoreDrawBackground) {
-                    if (clrTextBk !is -1) {
-
+_
-                    } else {
-                        Control control = findImageControl ();
@@ -760 +757 @@
-                            if (i is 0) {
-                                int right = Math.min (rect.right, width);
-&
-) fillImageBackground (hDC, control, &
+
+_) fillImageBackground (hDC, control, 
-                            } else {
-) fillImageBackground (hDC, control, &
+_) fillImageBackground (hDC, control, 
-                            }
-                        }
@@ -794 +791 @@
-                            gc.dispose ();
-                        }
-&
+
-                    } else {
-                        if (i is 0) {
@@ -802 +799 @@
-                            }
-                        } else {
-&
+
-                        }
-                    }
@@ -833 +830 @@
-                            }
-                            TCHAR[] buffer = StrToTCHARs (getCodePage (), string, false);
-&
-&
+
+
-                            if (hFont !is cast(HFONT)-1) hFont = cast(HFONT)OS.SelectObject (hDC, hFont);
-                            if (clrText !is -1) clrText = OS.SetTextColor (hDC, clrText);
@@ -844 +841 @@
-            if (selectionForeground !is -1) clrText = selectionForeground;
-            if (hooks (DWT.PaintItem)) {
-
+*
-                int nSavedDC = OS.SaveDC (hDC);
-                GCData data = new GCData ();
@@ -884 +881 @@
-                event.width = itemRect.right - itemRect.left;
-                event.height = itemRect.bottom - itemRect.top;
-
+*
-                int cellWidth = cellRect.right - cellRect.left;
-                int cellHeight = cellRect.bottom - cellRect.top;
@@ -931 +928 @@
-                            } else {
-                                int index = OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0);
-
-
+*
+*
-                                OS.IntersectClipRect (hDC, clipRect.left, clipRect.top, clipRect.right, clipRect.bottom);
-&
+
-                                OS.SelectClipRgn (hDC, null);
-                            }
@@ -1024 +1021 @@
-            RECT rect;
-            OS.SetRect (&rect, nmcd.nmcd.rc.left, nmcd.nmcd.rc.top, nmcd.nmcd.rc.right, nmcd.nmcd.rc.bottom);
-
+*
-            if (clrSortBk !is -1) {
-&
+
-            } else {
-                if (OS.IsWindowEnabled (handle) || findImageControl () !is null) {
@@ -1099 +1096 @@
-                            fillBackground (hDC, clrTextBk, &rect);
-                        } else {
-
+*
-                            if (measureEvent !is null) {
-                                textRect.right = Math.min (cellRect.right, measureEvent.x + measureEvent.width);
-                            }
-&
+
-                        }
-                    } else {
-&
+
-                    }
-                }
@@ -1117 +1114 @@
-                if (explorerTheme) {
-                    if ((style & DWT.FULL_SELECTION) is 0) {
-
-
+*
+*
-                        if (measureEvent !is null) {
-                            pRect.right = Math.min (pClipRect.right, measureEvent.x + measureEvent.width);
@@ -1130 +1127 @@
-                        int iStateId = selected ? OS.TREIS_SELECTED : OS.TREIS_HOT;
-                        if (OS.GetFocus () !is handle && selected && !hot) iStateId = OS.TREIS_SELECTEDNOTFOCUS;
-&pRect, &
+pRect, 
-                        OS.CloseThemeData (hTheme);
-                    }
@@ -1145 +1142 @@
-                            fillBackground (hDC, OS.GetBkColor (hDC), &rect);
-                        } else {
-&
+
-                        }
-                    } else {
-
+*
-                        if (measureEvent !is null) {
-                            textRect.right = Math.min (cellRect.right, measureEvent.x + measureEvent.width);
-                        }
-&
+
-                    }
-                }
@@ -1179 +1176 @@
-            }
-            if (focused && !ignoreDrawFocus && (style & DWT.FULL_SELECTION) is 0) {
-
+*
-                if (measureEvent !is null) {
-                    textRect.right = Math.min (cellRect.right, measureEvent.x + measureEvent.width);
@@ -1185 +1182 @@
-                nmcd.nmcd.uItemState &= ~OS.CDIS_FOCUS;
-                OS.MoveMemory (lParam, nmcd, NMTVCUSTOMDRAW.sizeof);
-
-
+
-            }
-            if (explorerTheme) {
@@ -1192 +1188 @@
-                OS.MoveMemory (cast(void*)lParam, nmcd, NMTVCUSTOMDRAW.sizeof);
-            }
-
+*
-            OS.SaveDC (hDC);
-            OS.SelectClipRgn (hDC, null);
@@ -1323 +1319 @@
-                            fillBackground (hDC, clrTextBk, &rect);
-                        } else {
-
-&
+*
+
-                        }
-                    }
@@ -2659 +2655 @@
-}
-
-
+override 
-    super.destroyScrollBar (type);
-    int bits = OS.GetWindowLong (handle, OS.GWL_STYLE);
@@ -2722 +2718 @@
-}
-
- cellRect, inout RECT
+* cellRect, inout RECT*
-    bool found = false;
-    TVHITTESTINFO lpht;
@@ -2757 +2753 @@
-            } else {
-                cellRect.right = Math.min (cellRect.right, rect.right);
-&
+
-                    if (isCustomToolTip ()) {
-                        Event event = sendMeasureItemEvent (item, order [index], hDC);
-                        if (isDisposed () || item.isDisposed ()) break;
-//itemRect [0]
+itemRect
-                        itemRect.left = event.x;
-                        itemRect.right = event.x + event.width;
@@ -4377 +4373 @@
-
-Event sendMeasureItemEvent (TreeItem item, int index, HDC hDC) {
-
+*
-    int nSavedDC = OS.SaveDC (hDC);
-    GCData data = new GCData ();
@@ -5412 +5408 @@
-        int index;
-        TreeItem item;
-
+*
-        if (findCell (pt.x, pt.y, item, index, cellRect, itemRect)) {
-            String text = null;
@@ -6582 +6578 @@
-            int index;
-            TreeItem item;
-
+*
-            if (findCell (x, y, item, index, cellRect, itemRect)) {
-                /*
@@ -7600 +7596 @@
-            int index;
-            TreeItem item;
-
+*
-            if (findCell (pt.x, pt.y, item, index, cellRect, itemRect)) {
-&
+
-                OS.MapWindowPoints (handle, null, cast(POINT*)toolRect, 2);
-                int width = toolRect.right - toolRect.left;
@@ -7643 +7639 @@
-                    int index;
-                    TreeItem item;
-
+*
-                    int pos = OS.GetMessagePos ();
-                    POINT pt;
@@ -7657 +7653 @@
-                        cellRect = item.getBounds (index, true, true, false, false, false, hDC);
-                        if (hooks (DWT.EraseItem)) {
-&
+
-                            if (isDisposed () || item.isDisposed ()) break;
-                            if (event.doit) {
@@ -7668 +7664 @@
-                            int nSavedDC = OS.SaveDC (nmcd.nmcd.hdc);
-                            int gridWidth = getLinesVisible () ? Table.GRID_WIDTH : 0;
-&
+
-                            OS.SetWindowOrgEx (nmcd.nmcd.hdc, insetRect.left, insetRect.top, null);
-                            GCData data = new GCData ();
@@ -7681 +7677 @@
-                            if (image !is null || index is 0) {
-                                Point size = getImageSize ();
-
+*
-                                if (imageList is null) size.x = imageRect.right - imageRect.left;
-                                if (image !is null) {
@@ -7710 +7706 @@
-                        if (hooks (DWT.PaintItem)) {
-                            itemRect = item.getBounds (index, true, true, false, false, false, hDC);
-&
+
-                        }
-                        OS.SelectObject (hDC, oldFont);

dwt/widgets/TreeColumn.d

@@ -367 +367 @@
-                auto hFont = item.fontHandle (index);
-                if (hFont !is cast(HFONT)-1) hFont = OS.SelectObject (hDC, hFont);
-
+*
-                if (hFont !is cast(HFONT)-1) OS.SelectObject (hDC, hFont);
-                itemRight = itemRect.right;
@@ -660 +660 @@
-    checkWidget ();
-    if (string is null) error (DWT.ERROR_NULL_ARGUMENT);
-==/*eq*/text
+.equals (text)
-    int index = parent.indexOf (this);
-    if (index is -1) return;

dwt/widgets/TreeItem.d

@@ -403 +403 @@
-    checkWidget ();
-    if (!parent.checkData (this, true)) error (DWT.ERROR_WIDGET_DISPOSED);
-
+*
-    int width = rect.right - rect.left, height = rect.bottom - rect.top;
-    return new Rectangle (rect.left, rect.top, width, height);
@@ -425 +425 @@
-    checkWidget();
-    if (!parent.checkData (this, true)) error (DWT.ERROR_WIDGET_DISPOSED);
-
+*
-    int width = rect.right - rect.left, height = rect.bottom - rect.top;
-    return new Rectangle (rect.left, rect.top, width, height);
-}
-
-
+*
-    return getBounds (index, getText, getImage, fullText, false, true, null);
-}
-
-//TODO - take into account grid (add bool arg) to damage less during redraw
-
-RECT.init
+*
+new RECT()
-    auto hwnd = parent.handle;
-    if ((parent.style & DWT.VIRTUAL) is 0 && !cached && !parent.painted) {
@@ -454 +454 @@
-        firstColumn = index is OS.SendMessage (hwndHeader, OS.HDM_ORDERTOINDEX, 0, 0);
-    }
- rect
+* rect = new RECT()
-    if (firstColumn) {
-        bool full = columnCount is 0 && getText && getImage && fullText && fullImage;
-&
-RECT.init
+
+new RECT()
-        }
-        if (getImage && !fullImage) {
@@ -471 +471 @@
-        if (fullText || fullImage || clip) {
-            if (hwndHeader !is null) {
- headerRect
+* headerRect = new RECT()
-                if (columnCount !is 0) {
-&
-RECT.init
+
+new RECT()
-                    }
-                } else {
@@ -488 +488 @@
-        }
-    } else {
-RECT.init
- headerRect
-&
-RECT.init
-
-&
-RECT.init
+new RECT()
+* headerRect = new RECT()
+
+new RECT()
+
+
+new RECT()
-        }
-        rect.left = headerRect.left;
@@ -518 +518 @@
-                    String string = index is 0 ? text : strings !is null ? strings [index] : null;
-                    if (string !is null) {
- textRect
+* textRect = new RECT()
-                        TCHAR[] buffer = StrToTCHARs (parent.getCodePage (), string, false);
-                        int flags = OS.DT_NOPREFIX | OS.DT_SINGLELINE | OS.DT_CALCRECT;
@@ -529 +529 @@
-                            hFont = OS.SelectObject (hNewDC, hFont);
-                        }
-&
+
-                        if (hDC is null) {
-                            OS.SelectObject (hNewDC, hFont);
@@ -848 +848 @@
-    checkWidget();
-    if (!parent.checkData (this, true)) error (DWT.ERROR_WIDGET_DISPOSED);
-
+*
-    int width = rect.right - rect.left, height = rect.bottom - rect.top;
-    return new Rectangle (rect.left, rect.top, width, height);
@@ -938 +938 @@
-    checkWidget();
-    if (!parent.checkData (this, true)) error (DWT.ERROR_WIDGET_DISPOSED);
-
+*
-    if (index is 0) rect.left += Tree.INSET - 1;
-    rect.left = Math.min (rect.left, rect.right);
@@ -1005 +1005 @@
-    if (!OS.IsWindowVisible (hwnd)) return;
-    bool fullImage = column is 0 && drawText && drawImage;
-
-&
+*
+
-}
-