Changeset 213:36f5cb12e1a2 for dwt/graphics/GC.d

Timestamp:

05/17/08 11:34:28 (8 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Update to SWT 3.4M7

Files:

• dwt/graphics/GC.d (modified) (32 diffs)

dwt/graphics/GC.d

@@ -74 +74 @@
-public final class GC : Resource {
-
+    alias Resource.init_ init_;
+
-    /**
-     * the handle to the OS device context
@@ -182 +184 @@
-    this.device = data.device = device;
-    init_ (drawable, data, hDC);
-f (device.tracking) device.new_Object(this
+nit_(
-}
-
@@ -264 +266 @@
-            }
-            if (dashes !is null) {
-
+.ptr
-                Gdip.Pen_SetDashStyle(pen, Gdip.DashStyleCustom);
-                Gdip.Pen_SetDashOffset(pen, dashOffset);
@@ -324 +326 @@
-        }
-        if ((state & FONT) !is 0) {
-
-
+
+
+
-            if (data.gdipFont !is null) Gdip.Font_delete(data.gdipFont);
-f
+gdipF
-        }
-        if ((state & DRAW_OFFSET) !is 0) {
-            data.gdipXOffset = data.gdipYOffset = 0;
-            auto matrix = Gdip.Matrix_new(1, 0, 0, 1, 0, 0);
-6] elements
+2] point; point[0]=1.0; point[1]=1.0
-            Gdip.Graphics_GetTransform(gdipGraphics, matrix);
-GetElements(matrix, elements 
+TransformPoints(matrix, cast(Gdip.PointF*)point.ptr, 1
-            Gdip.Matrix_delete(matrix);
-elements
+point
-            if (scaling < 0) scaling = -scaling;
-            float penWidth = data.lineWidth * scaling;
@@ -342 +345 @@
-                data.gdipXOffset = 0.5f / scaling;
-            }
-elements[3
+point[1
-            if (scaling < 0) scaling = -scaling;
-            penWidth = data.lineWidth * scaling;
@@ -440 +443 @@
-    }
-    if ((state & FONT) !is 0) {
-
+
+
-    }
-}
@@ -628 +632 @@
- * </ul>
- */
-
-
-
-
+
+
-    disposeGdip();
+    if (gdip && (data.style & DWT.MIRRORED) !is 0) {
+        OS.SetLayout(handle, OS.GetLayout(handle) | OS.LAYOUT_RTL);
+    }
-
-    /* Select stock pen and brush objects and free resources */
@@ -662 +667 @@
-    * Dispose the HDC.
-    */
-    Device device = data.device;
-    if (drawable !is null) drawable.internal_dispose_GC(handle, data);
-    drawable = null;
@@ -668 +672 @@
-    data.image = null;
-    data.ps = null;
-    if (device.tracking) device.dispose_Object(this);
-    data.device = null;
-    data = null;
-}
@@ -817 +819 @@
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-    if ((data.uiState & OS.UISF_HIDEFOCUS) !is 0) return;
+    data.focusDrawn = true;
-    HDC hdc = handle;
-    int state = 0;
@@ -838 +841 @@
-        if (!Gdip.Matrix_IsIdentity(matrix)) {
-            gotElements = true;
-
+.ptr
-        }
-        Gdip.Matrix_delete(matrix);
-        hdc = Gdip.Graphics_GetHDC(gdipGraphics);
-        state = OS.SaveDC(hdc);
-        OS.SetBkColor(hdc, data.background);
-        OS.SetTextColor(hdc, data.foreground);
-        if (gotElements) {
-            OS.SetGraphicsMode(hdc, OS.GM_ADVANCED);
@@ -854 +855 @@
-        }
-    }
+    OS.SetBkColor(hdc, 0xFFFFFF);
+    OS.SetTextColor(hdc, 0x000000);
-    RECT rect;
-    OS.SetRect(&rect, x, y, x + width, y + height);
@@ -860 +863 @@
-        OS.RestoreDC(hdc, state);
-        Gdip.Graphics_ReleaseHDC(gdipGraphics, hdc);
+    } else {
+        data.state &= ~(BACKGROUND_TEXT | FOREGROUND_TEXT);
-    }
-}
@@ -935 +940 @@
-    if (data.gdipGraphics !is null) {
-        //TODO - cache bitmap
-
+ /*long*/ 
-        auto img = cast(Gdip.Image) gdipImage[0];
-        int imgWidth = Gdip.Image_GetWidth(img);
@@ -1427 +1432 @@
-    auto srcHdc = OS.CreateCompatibleDC(handle);
-    auto oldSrcBitmap = OS.SelectObject(srcHdc, srcColor);
-
+
+
-    HDC tempHdc;
-    HBITMAP tempBitmap;
@@ -1807 +1813 @@
-    if (gdipGraphics !is null) {
-        Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend);
-[])pointArray
+*)pointArray.ptr
-        Gdip.Graphics_TranslateTransform(gdipGraphics, -data.gdipXOffset, -data.gdipYOffset, Gdip.MatrixOrderPrepend);
-        return;
@@ -1852 +1858 @@
-    if (gdipGraphics !is null) {
-        Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend);
-[])pointArray
+*)pointArray.ptr
-        Gdip.Graphics_TranslateTransform(gdipGraphics, -data.gdipXOffset, -data.gdipYOffset, Gdip.MatrixOrderPrepend);
-        return;
@@ -1899 +1905 @@
-    auto gdipGraphics = data.gdipGraphics;
-    if (gdipGraphics !is null) {
+        if (width < 0) {
+            x = x + width;
+            width = -width;
+        }
+        if (height < 0) {
+            y = y + height;
+            height = -height;
+        }
-        Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend);
-        Gdip.Graphics_DrawRectangle(gdipGraphics, data.gdipPen, x, y, width, height);
@@ -2037 +2051 @@
-
-    Gdip.Graphics_TranslateTransform(gdipGraphics, data.gdipXOffset, data.gdipYOffset, Gdip.MatrixOrderPrepend);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    Gdip.Graphics_TranslateTransform(gdipGraphics, -data.gdipXOffset, -data.gdipYOffset, Gdip.MatrixOrderPrepend);
-}
@@ -2317 +2335 @@
-        Gdip.StringFormat_SetFormatFlags(format, formatFlags);
-        float[] tabs = (flags & DWT.DRAW_TAB) !is 0 ? [ cast(float) measureSpace(data.gdipFont, format) * 8] : new float[1];
-
+.ptr
-        int hotkeyPrefix = (flags & DWT.DRAW_MNEMONIC) !is 0 ? Gdip.HotkeyPrefixShow : Gdip.HotkeyPrefixNone;
-        if ((flags & DWT.DRAW_MNEMONIC) !is 0 && (data.uiState & OS.UISF_HIDEACCEL) !is 0) hotkeyPrefix = Gdip.HotkeyPrefixHide;
@@ -2769 +2787 @@
-    if (data.gdipGraphics !is null) {
-        int mode = OS.GetPolyFillMode(handle) is OS.WINDING ? Gdip.FillModeWinding : Gdip.FillModeAlternate;
-[])pointArray
+*)pointArray.ptr
-        return;
-    }
@@ -2804 +2822 @@
-    checkGC(FILL);
-    if (data.gdipGraphics !is null) {
+        if (width < 0) {
+            x = x + width;
+            width = -width;
+        }
+        if (height < 0) {
+            y = y + height;
+            height = -height;
+        }
-        Gdip.Graphics_FillRectangle(data.gdipGraphics, data.gdipBrush, x, y, width, height);
-        return;
@@ -2887 +2913 @@
-        nah = 0 - nah;
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        } else {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -3270 +3300 @@
-public Font getFont () {
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-Font.win32_new(data.device, data.hFont)
+data.font
-}
-
@@ -3667 +3697 @@
-    if ((data.style & DWT.MIRRORED) !is 0) {
-        int width = 0;
-
-
+
+
+
+
+
+
-            BITMAP bm;
-            OS.GetObject(image.handle, BITMAP.sizeof, &bm);
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-        POINT pt;
@@ -3698 +3747 @@
-    }
-    data.state &= ~(NULL_BRUSH | NULL_PEN);
-auto hFont = data.hF
-hFont !is null && hFont !is cast(HFONT)-1 
+Font font = data.f
+font !is null
-        data.state &= ~FONT;
-    } else {
-hFont = OS.GetCurrentObject(hDC, OS.OBJ_FONT
+font = Font.win32_new(device, OS.GetCurrentObject(hDC, OS.OBJ_FONT)
-    }
-    auto hPalette = data.device.hPalette;
@@ -3764 +3813 @@
-public bool isClipped() {
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+    auto gdipGraphics = data.gdipGraphics;
+    if (gdipGraphics !is null) {
+        auto rgn = Gdip.Region_new();
+        Gdip.Graphics_GetClip(data.gdipGraphics, rgn);
+        bool isInfinite = Gdip.Region_IsInfinite(rgn, gdipGraphics) !is 0;
+        Gdip.Region_delete(rgn);
+        return !isInfinite;
+    }
-    auto region = OS.CreateRectRgn(0, 0, 0, 0);
-auto
+int
-    OS.DeleteObject(region);
-    return result > 0;
@@ -4069 +4126 @@
-        int mode = OS.GetPolyFillMode(handle) is OS.WINDING ? Gdip.FillModeWinding : Gdip.FillModeAlternate;
-        Gdip.GraphicsPath_SetFillMode(path.handle, mode);
-
+Path
-    }
-}
@@ -4164 +4221 @@
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-    if (font !is null && font.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-hFont = font !is null ? font.handle
+font = font !is null ? font
-    data.state &= ~FONT;
-}
@@ -4328 +4385 @@
-        }
-    }
-join
+cap
-    if (cap !is data.lineCap) {
-        mask |= LINE_CAP;
@@ -4801 +4858 @@
-        Gdip.StringFormat_SetFormatFlags(format, formatFlags);
-        float[] tabs = (flags & DWT.DRAW_TAB) !is 0 ? [measureSpace(data.gdipFont, format) * 8] : new float[1];
-
+.ptr
-        Gdip.StringFormat_SetHotkeyPrefix(format, (flags & DWT.DRAW_MNEMONIC) !is 0 ? Gdip.HotkeyPrefixShow : Gdip.HotkeyPrefixNone);
-        Gdip.Graphics_MeasureString(data.gdipGraphics, buffer, length_, data.gdipFont, pt, format, bounds);
@@ -4877 +4934 @@
-    GC gc = new GC();
-    gc.device = data.device;
+    data.style |= DWT.LEFT_TO_RIGHT;
+    if (OS.WIN32_VERSION >= OS.VERSION (4, 10)) {
+        int flags = OS.GetLayout (hDC);
+        if ((flags & OS.LAYOUT_RTL) !is 0) {
+            data.style |= DWT.RIGHT_TO_LEFT | DWT.MIRRORED;
+        }
+    }
-    gc.init_(null, data, hDC);
-    return gc;