Ignore borders in DrawerVisitor 10/13910/4
Vincent COUVERT [Wed, 5 Mar 2014 10:17:36 +0000 (11:17 +0100)]
Change-Id: Id1c1e040fe2726f772848233799c8b9d11988c5a

scilab/modules/renderer/src/java/org/scilab/modules/renderer/JoGLView/DrawerVisitor.java

index 8417771..4a467bf 100755 (executable)
@@ -1020,9 +1020,8 @@ public class DrawerVisitor implements Visitor, Drawer, GraphicView {
         GraphicObject object = GraphicController.getController().getObjectFromId(id);
         int objectType = (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_TYPE__);
         int objectStyle = (objectType == GraphicObjectProperties.__GO_UICONTROL__ ? (Integer) GraphicController.getController().getProperty(id, GraphicObjectProperties.__GO_STYLE__) : -1);
-        if ((object != null) && isFigureChild(id)
-                || (objectType == GraphicObjectProperties.__GO_UICONTROL__ && objectStyle == GraphicObjectProperties.__GO_UI_FRAME__)
-                && objectType != GraphicObjectProperties.__GO_UIMENU__) {
+        if ((object != null) && isFigureChild(id) || (objectType == GraphicObjectProperties.__GO_UICONTROL__ && objectStyle == GraphicObjectProperties.__GO_UI_FRAME__)
+                && objectType != GraphicObjectProperties.__GO_UIMENU__ && objectType != GraphicObjectProperties.__GO_UI_FRAME_BORDER__) {
 
             if (GraphicObjectProperties.__GO_VALID__ == property) {
                 return false;
@@ -1085,8 +1084,8 @@ public class DrawerVisitor implements Visitor, Drawer, GraphicView {
                     if (go instanceof Axes) {
                         axesDrawer.computeRulers((Axes) go);
                     }
-                }               
-                
+                }
+
             } else if (object instanceof Axes && property == GraphicObjectProperties.__GO_X_AXIS_LOCATION__ ||
                        property == GraphicObjectProperties.__GO_Y_AXIS_LOCATION__ || property == GraphicObjectProperties.__GO_AUTO_MARGINS__) {
                 axesDrawer.computeMargins((Axes) object);