Commit 9a0cb463 authored by Sebastian Pretscher's avatar Sebastian Pretscher

Improvements on ConflictView

parent d0e782b8
......@@ -81,6 +81,7 @@ public class CupReduceGraphView implements CupParserLaLrChangeObserver,
// Some Constants
private static final int BUTTON_WIDTH = 120;
private static final int LABEL_WIDTH = 40;
public static final Object modelBuildLock = new Object();
public GraphViewer graphViewer;
......@@ -99,12 +100,12 @@ public class CupReduceGraphView implements CupParserLaLrChangeObserver,
this.parseModel.registerModelObserver(this);
this.parentComposite = parent;
GridLayout parentLayout = new GridLayout(4, false);
GridLayout parentLayout = new GridLayout(5, false);
this.parentComposite.setLayout(parentLayout);
this.graphComposite = new Composite(parent, SWT.NONE);
this.graphComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL,
true, true, 4, 1));
true, true, 5, 1));
this.graphComposite.setLayout(new FillLayout());
nodeModel = new ParserNodeModelContentProvider();
......@@ -204,6 +205,9 @@ public class CupReduceGraphView implements CupParserLaLrChangeObserver,
e1.printStackTrace();
}
if (zoomManager != null) {
org.eclipse.swt.widgets.Label zoomLabel = new org.eclipse.swt.widgets.Label(this.parentComposite, SWT.WRAP);
zoomLabel.setLayoutData(new GridData(LABEL_WIDTH, 20));
zoomLabel.setText("Zoom:");
Combo combo = new Combo(this.parentComposite, SWT.READ_ONLY);
combo.setLayoutData(new GridData(BUTTON_WIDTH, 20));
String[] levels = zoomManager.getZoomLevelsAsText();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment