Skip to content

Commit 671e248

Browse files
akoch-yattaptziegler
authored andcommitted
Disable autoscaling for GrapicalEditors
This commit applies the disabledment of SWT autoscaling to the FlyoutPaletteComposite and the Splitter for the GrephicalEditorWithPalette instead of only the FigureCanvas instances. This ensures a consistent zoom context for all child elements, e.g. rulers or other custom child elements.
1 parent 66db53b commit 671e248

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

org.eclipse.gef/src/org/eclipse/gef/ui/palette/FlyoutPaletteComposite.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,12 @@
8181
import org.eclipse.draw2d.LightweightSystem;
8282
import org.eclipse.draw2d.MarginBorder;
8383
import org.eclipse.draw2d.PositionConstants;
84+
import org.eclipse.draw2d.ScalableLightweightSystem;
8485
import org.eclipse.draw2d.TextUtilities;
8586
import org.eclipse.draw2d.Triangle;
8687
import org.eclipse.draw2d.geometry.Dimension;
8788
import org.eclipse.draw2d.internal.DrawableTextUtilities;
89+
import org.eclipse.draw2d.internal.InternalDraw2dUtils;
8890

8991
import org.eclipse.gef.GraphicalViewer;
9092
import org.eclipse.gef.dnd.TemplateTransfer;
@@ -188,6 +190,8 @@ public void perspectiveChanged(IWorkbenchPage page, IPerspectiveDescriptor persp
188190
public FlyoutPaletteComposite(Composite parent, int style, IWorkbenchPage page, PaletteViewerProvider pvProvider,
189191
FlyoutPreferences preferences) {
190192
super(parent, style | SWT.NO_BACKGROUND | SWT.NO_REDRAW_RESIZE | SWT.DOUBLE_BUFFERED);
193+
InternalDraw2dUtils.configureForAutoscalingMode(this, scale -> {
194+
});
191195
provider = pvProvider;
192196
prefs = preferences;
193197
sash = createSash();
@@ -1217,7 +1221,7 @@ private String getButtonTooltipText() {
12171221

12181222
private void init() {
12191223
setCursor(Cursors.ARROW);
1220-
lws = new LightweightSystem();
1224+
lws = InternalDraw2dUtils.isAutoScaleEnabled() ? new ScalableLightweightSystem() : new LightweightSystem();
12211225
lws.setControl(this);
12221226
final ArrowButton b = new ArrowButton(getArrowDirection());
12231227
b.setRolloverEnabled(true);
@@ -1356,7 +1360,7 @@ public void focusLost(FocusEvent fe) {
13561360
}
13571361
});
13581362

1359-
lws = new LightweightSystem();
1363+
lws = InternalDraw2dUtils.isAutoScaleEnabled() ? new ScalableLightweightSystem() : new LightweightSystem();
13601364
lws.setControl(this);
13611365
lws.setContents(contents);
13621366
setCursor(Cursors.SIZEALL);

org.eclipse.gef/src/org/eclipse/gef/ui/parts/GraphicalEditorWithPalette.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import org.eclipse.swt.SWT;
1616
import org.eclipse.swt.widgets.Composite;
1717

18+
import org.eclipse.draw2d.internal.InternalDraw2dUtils;
19+
1820
import org.eclipse.gef.DefaultEditDomain;
1921
import org.eclipse.gef.palette.PaletteRoot;
2022
import org.eclipse.gef.ui.palette.PaletteViewer;
@@ -58,6 +60,8 @@ protected void createPaletteViewer(Composite parent) {
5860
@Override
5961
public void createPartControl(Composite parent) {
6062
Splitter splitter = new Splitter(parent, SWT.HORIZONTAL);
63+
InternalDraw2dUtils.configureForAutoscalingMode(splitter, scale -> {
64+
});
6165
createPaletteViewer(splitter);
6266
createGraphicalViewer(splitter);
6367
splitter.maintainSize(getPaletteViewer().getControl());

0 commit comments

Comments
 (0)