diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/editpolicy/AppEditLayoutPolicy.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/editpolicy/AppEditLayoutPolicy.java index 5fcc1fe24c6c002c48b4e7b7dd3dae3ccf268a1e..d6303ee0e842e868e81c578b68450b0d9e0d1303 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/editpolicy/AppEditLayoutPolicy.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/editpolicy/AppEditLayoutPolicy.java @@ -143,8 +143,8 @@ public class AppEditLayoutPolicy extends XYLayoutEditPolicy { BControl newObj = (BControl) request.getNewObject(); - CreateCommand createCmd = new CreateCommand( - newObj, (BControl) getHost().getModel()); + CreateCommand createCmd = new CreateCommand(newObj, + (BControl) getHost().getModel()); Rectangle constraint = (Rectangle) getConstraintFor(request); constraint.x = (constraint.x < 0) ? 0 : constraint.x; @@ -157,7 +157,7 @@ public class AppEditLayoutPolicy extends XYLayoutEditPolicy { .getAttributes().get( AttributeConstants.ATTRIBUTE_HEIGHT); - if (atrWidth != null) { + if (atrWidth != null && !atrWidth.isEditable()) { constraint.width = Integer.valueOf(atrWidth.getValue() .toString()); } else { @@ -165,7 +165,7 @@ public class AppEditLayoutPolicy extends XYLayoutEditPolicy { : constraint.width; } - if (atrHeight != null) { + if (atrHeight != null && !atrHeight.isEditable()) { constraint.height = Integer.valueOf(atrHeight.getValue() .toString()); } else { diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableColumnFigure.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableColumnFigure.java index ce1c1f6b842ad8604c98a0e7e665f448370448ae..1b03990e88d9fd86f86035d8f48b58e6e78128b1 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableColumnFigure.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableColumnFigure.java @@ -10,7 +10,7 @@ public class TableColumnFigure extends AbstractTableFigure { public TableColumnFigure() { ToolbarLayout toolbarLayout = new ToolbarLayout(); setLayoutManager(toolbarLayout); - setOpaque(true); + setOpaque(false); } @Override @@ -19,7 +19,6 @@ public class TableColumnFigure extends AbstractTableFigure { Color foregroundColor = getForegroundColor(); if (foregroundColor != null) g.setForegroundColor(foregroundColor); - // g.drawLine(r.x, r.y, r.x + r.width, r.y); // Left line g.drawLine(r.x, r.y, r.x, r.y + r.height - 15); diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableFigure.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableFigure.java index e1b395942dda8da0f35d5952b53cfcead3d5384c..3f0dafe095a12ff114047216986abd403ab3f66a 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableFigure.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/figure/TableFigure.java @@ -16,7 +16,7 @@ public class TableFigure extends AbstractTableFigure { ToolbarLayout toolbarLayout = new ToolbarLayout(); toolbarLayout.setHorizontal(true); setLayoutManager(toolbarLayout); - setOpaque(true); + setOpaque(false); } @Override diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTableColumnPart.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTableColumnPart.java index 0955e8bc5638fbd37a21c970ddbd1a5644d72874..55b7db8b1522a68d2861eb79b27f152e5f111707 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTableColumnPart.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTableColumnPart.java @@ -22,7 +22,6 @@ public class BTableColumnPart extends AppAbstractEditPart { protected IFigure createEditFigure() { TableColumnFigure tableColumnFigure = new TableColumnFigure(); Label figure = new Label(); - figure.setOpaque(true); tableColumnFigure.add(figure); if (!isRunning()) { figure.setIcon(BMotionStudioImage diff --git a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTablePart.java b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTablePart.java index 95f025ef1acbe7bb595e18db990dbcede706d3a3..ce86dc2cff01fb0b1f5d70ecb0ad8b624c9a2677 100644 --- a/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTablePart.java +++ b/de.bmotionstudio.gef.editor/src/de/bmotionstudio/gef/editor/part/BTablePart.java @@ -27,7 +27,6 @@ public class BTablePart extends AppAbstractEditPart { protected IFigure createEditFigure() { TableFigure tableFigure = new TableFigure(); Label figure = new Label(); - figure.setOpaque(true); tableFigure.add(figure); if (!isRunning()) { figure.setIcon(BMotionStudioImage