Changeset 213:36f5cb12e1a2 for dwt/custom/ScrolledComposite.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/custom/ScrolledComposite.d (modified) (7 diffs)

dwt/custom/ScrolledComposite.d

@@ -16 +16 @@
-import dwt.DWT;
-import dwt.DWTException;
+import dwt.events.DisposeEvent;
+import dwt.events.DisposeListener;
-import dwt.graphics.Point;
-import dwt.graphics.Rectangle;
-import dwt.widgets.Composite;
-import dwt.widgets.Control;
+import dwt.widgets.Display;
-import dwt.widgets.Event;
-import dwt.widgets.Layout;
-import dwt.widgets.Listener;
-import dwt.widgets.ScrollBar;
+import dwt.widgets.Shell;
-import dwt.custom.ScrolledCompositeLayout;
-import dwt.dwthelper.utils;
@@ -114 +118 @@
-    Control content;
-    Listener contentListener;
+    Listener filter;
-
-    int minHeight = 0;
@@ -120 +125 @@
-    bool expandVertical = false;
-    bool alwaysShowScroll = false;
+    bool showFocusedControl = false;
-
-/**
@@ -177 +183 @@
-        }
-    };
+
+    filter = new class() Listener {
+        public void handleEvent(Event event) {
+            if ( auto control = cast(Control)event.widget ) {
+                if (contains(control)) showControl(control);
+            }
+        }
+    };
+
+    addDisposeListener(new class() DisposeListener {
+        public void widgetDisposed(DisposeEvent e) {
+            getDisplay().removeFilter(DWT.FocusIn, filter);
+        }
+    });
-}
-
@@ -182 +202 @@
-    int mask = DWT.H_SCROLL | DWT.V_SCROLL | DWT.BORDER | DWT.LEFT_TO_RIGHT | DWT.RIGHT_TO_LEFT;
-    return style & mask;
+}
+
+bool contains(Control control) {
+    if (control is null || control.isDisposed()) return false;
+
+    Composite parent = control.getParent();
+    while (parent !is null && !( null !is cast(Shell)parent )) {
+        if (this is parent) return true;
+        parent = parent.getParent();
+    }
+    return false;
-}
-
@@ -276 +307 @@
-    //checkWidget();
-    return content;
+}
+
+/**
+ * Returns <code>true</code> if the receiver automatically scrolls to a focused child control
+ * to make it visible. Otherwise, returns <code>false</code>.
+ *
+ * @exception DWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.4
+ */
+public bool getShowFocusedControl() {
+    checkWidget();
+    return showFocusedControl;
-}
-
@@ -587 +634 @@
-}
-
+/**
+ * Configure the receiver to automatically scroll to a focused child control
+ * to make it visible.
+ *
+ * If show is <code>false</code>, show a focused control is off.
+ * By default, show a focused control is off.
+ *
+ * @param show <code>true</code> to show a focused control.
+ *
+ * @exception DWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ *  @since 3.4
+ */
+public void setShowFocusedControl(bool show) {
+    checkWidget();
+    if (showFocusedControl is show) return;
+    Display display = getDisplay();
+    display.removeFilter(DWT.FocusIn, filter);
+    showFocusedControl = show;
+    if (!showFocusedControl) return;
+    display.addFilter(DWT.FocusIn, filter);
+    Control control = display.getFocusControl();
+    if (contains(control)) showControl(control);
+}
+
+/**
+ * Scrolls the content of the receiver so that the control is visible.
+ *
+ * @param control the control to be shown
+ *
+ * @exception IllegalArgumentException <ul>
+ *    <li>ERROR_NULL_ARGUMENT - if the control is null</li>
+ *    <li>ERROR_INVALID_ARGUMENT - if the control has been disposed</li>
+ * </ul>
+ * @exception DWTException <ul>
+ *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
+ *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
+ * </ul>
+ *
+ * @since 3.4
+ */
+public void showControl(Control control) {
+    checkWidget ();
+    if (control is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
+    if (control.isDisposed ()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
+    if (!contains(control)) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
+
+    Rectangle itemRect = getDisplay().map(control.getParent(), this, control.getBounds());
+    Rectangle area = getClientArea();
+    Point origin = getOrigin();
+    if (itemRect.x < 0) origin.x = Math.max(0, origin.x + itemRect.x);
+    if (itemRect.y < 0) origin.y = Math.max(0, origin.y + itemRect.y);
+    if (area.width < itemRect.x + itemRect.width) origin.x = Math.max(0, origin.x + itemRect.x + itemRect.width - area.width);
+    if (area.height < itemRect.y + itemRect.height) origin.y = Math.max(0, origin.y + itemRect.y + itemRect.height - area.height);
+    setOrigin(origin);
+}
+
-void vScroll() {
-    if (content is null) return;