X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.document.swt.core%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fswt%2Fcore%2Fwidget%2FScrolledCompositeWidget.java;fp=bundles%2Forg.simantics.document.swt.core%2Fsrc%2Forg%2Fsimantics%2Fdocument%2Fswt%2Fcore%2Fwidget%2FScrolledCompositeWidget.java;h=75f0fd98c661ef3d2a3c8e36b8e84fcda31e3aa2;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=6ee7a91d7b787f6dfcd91fe114aaccd79947b50e;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ScrolledCompositeWidget.java b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ScrolledCompositeWidget.java index 6ee7a91d7..75f0fd98c 100644 --- a/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ScrolledCompositeWidget.java +++ b/bundles/org.simantics.document.swt.core/src/org/simantics/document/swt/core/widget/ScrolledCompositeWidget.java @@ -1,83 +1,83 @@ -package org.simantics.document.swt.core.widget; - -import java.util.TreeMap; - -import org.eclipse.jface.layout.GridDataFactory; -import org.eclipse.jface.layout.GridLayoutFactory; -import org.eclipse.swt.SWT; -import org.eclipse.swt.custom.ScrolledComposite; -import org.eclipse.swt.events.ControlEvent; -import org.eclipse.swt.events.ControlListener; -import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Control; -import org.eclipse.swt.widgets.Display; -import org.simantics.document.server.JSONObject; -import org.simantics.document.server.client.WidgetData; -import org.simantics.document.swt.core.SWTDocument; -import org.simantics.document.swt.core.SWTViews; -import org.simantics.document.swt.core.base.HasWidgetsWidgetManager; -import org.simantics.document.swt.core.base.ScrolledCompositeContent; -import org.simantics.document.swt.core.base.WidgetContainer; - -public class ScrolledCompositeWidget extends HasWidgetsWidgetManager { - - @Override - protected void doUpdateProperties(SWTDocument document, ScrolledCompositeContent control, JSONObject object) { - } - - @Override - protected ScrolledCompositeContent doCreateControl(SWTDocument document, Composite parent, JSONObject object) { - - ScrolledComposite explorersScroll = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.BORDER); - explorersScroll.setBackground(Display.getCurrent().getSystemColor( - SWT.COLOR_WHITE)); - explorersScroll.setLayout(GridLayoutFactory.fillDefaults() - .margins(0, 0).spacing(0, 0).create()); - GridDataFactory.fillDefaults().grab(true, true).span(1, 1) - .applyTo(explorersScroll); - - ScrolledCompositeContent explorers = new ScrolledCompositeContent(explorersScroll, SWT.NONE); - - explorersScroll.addControlListener(new ControlListener() { - - @Override - public void controlResized(ControlEvent e) { - SWTViews.notifyScrolledComposite(explorers); - } - - @Override - public void controlMoved(ControlEvent e) { - SWTViews.notifyScrolledComposite(explorers); - } - }); - - explorers.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); - - // Make sure that exploders are initially visible - explorers.setSize(10, 300); - explorers.setLayout(GridLayoutFactory.fillDefaults().margins(0, 0).numColumns(1) - .spacing(0, 0).create()); - - explorersScroll.setMinSize(100, 100); - explorersScroll.setContent(explorers); - - return explorers; - - } - - @Override - public void updateChildren(SWTDocument document, JSONObject object, WidgetContainer widget, TreeMap childMap) { - - super.updateChildren(document, object, widget, childMap); - - for(WidgetData c : childMap.values()) { - - WidgetContainer con = (WidgetContainer)c.widget; - Control child = con.getControl(); - GridDataFactory.fillDefaults().grab(true, false).applyTo(child); - - } - - } - -} +package org.simantics.document.swt.core.widget; + +import java.util.TreeMap; + +import org.eclipse.jface.layout.GridDataFactory; +import org.eclipse.jface.layout.GridLayoutFactory; +import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.ScrolledComposite; +import org.eclipse.swt.events.ControlEvent; +import org.eclipse.swt.events.ControlListener; +import org.eclipse.swt.widgets.Composite; +import org.eclipse.swt.widgets.Control; +import org.eclipse.swt.widgets.Display; +import org.simantics.document.server.JSONObject; +import org.simantics.document.server.client.WidgetData; +import org.simantics.document.swt.core.SWTDocument; +import org.simantics.document.swt.core.SWTViews; +import org.simantics.document.swt.core.base.HasWidgetsWidgetManager; +import org.simantics.document.swt.core.base.ScrolledCompositeContent; +import org.simantics.document.swt.core.base.WidgetContainer; + +public class ScrolledCompositeWidget extends HasWidgetsWidgetManager { + + @Override + protected void doUpdateProperties(SWTDocument document, ScrolledCompositeContent control, JSONObject object) { + } + + @Override + protected ScrolledCompositeContent doCreateControl(SWTDocument document, Composite parent, JSONObject object) { + + ScrolledComposite explorersScroll = new ScrolledComposite(parent, SWT.V_SCROLL | SWT.BORDER); + explorersScroll.setBackground(Display.getCurrent().getSystemColor( + SWT.COLOR_WHITE)); + explorersScroll.setLayout(GridLayoutFactory.fillDefaults() + .margins(0, 0).spacing(0, 0).create()); + GridDataFactory.fillDefaults().grab(true, true).span(1, 1) + .applyTo(explorersScroll); + + ScrolledCompositeContent explorers = new ScrolledCompositeContent(explorersScroll, SWT.NONE); + + explorersScroll.addControlListener(new ControlListener() { + + @Override + public void controlResized(ControlEvent e) { + SWTViews.notifyScrolledComposite(explorers); + } + + @Override + public void controlMoved(ControlEvent e) { + SWTViews.notifyScrolledComposite(explorers); + } + }); + + explorers.setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_WHITE)); + + // Make sure that exploders are initially visible + explorers.setSize(10, 300); + explorers.setLayout(GridLayoutFactory.fillDefaults().margins(0, 0).numColumns(1) + .spacing(0, 0).create()); + + explorersScroll.setMinSize(100, 100); + explorersScroll.setContent(explorers); + + return explorers; + + } + + @Override + public void updateChildren(SWTDocument document, JSONObject object, WidgetContainer widget, TreeMap childMap) { + + super.updateChildren(document, object, widget, childMap); + + for(WidgetData c : childMap.values()) { + + WidgetContainer con = (WidgetContainer)c.widget; + Control child = con.getControl(); + GridDataFactory.fillDefaults().grab(true, false).applyTo(child); + + } + + } + +}