Changeset 71 for trunk/src/org/expeditee/gui/Frame.java

Timestamp:

05/21/08 14:58:38 (16 years ago)

Author:

ra33

Message:

Removed last remnants of adjusting position of items to account for the titleBar and the edge of the browser window.

Also fixed stuff with conversion of color and points so that they can handle additive mode correctly

File:

• trunk/src/org/expeditee/gui/Frame.java (modified) (4 diffs)

trunk/src/org/expeditee/gui/Frame.java

@@ -295 +295 @@
                         if (UserSettings.TitleTemplate == null) {
                                 frameTitle = new Text(getNextItemID(), title);
-                                frameTitle.setPosition(Item.MARGIN_LEFT
-                                                + org.expeditee.io.Conversion.X_ADJUST,
-                                                org.expeditee.io.Conversion.Y_ADJUST);
+                                frameTitle.resetTitlePosition();
                         } else {
                                 frameTitle = UserSettings.TitleTemplate.copy();
@@ -434 +432 @@
                 _frameName = new Text(id);
                 _frameName.setParent(this);
-                _frameName.setMaxSize(FrameGraphics.getMaxFrameSize());
                 _frameName.setText(getFramesetName() + _number);
-                _frameName.setPosition(FrameGraphics.getMaxFrameSize().width
-                                - _frameName.getBoundsWidth() - Item.MARGIN_RIGHT
-                                - org.expeditee.io.Conversion.X_ADJUST,
-                                org.expeditee.io.Conversion.Y_ADJUST);
+                _frameName.resetFrameNamePosition();
                 setChanged(oldchange);
         }
@@ -582 +576 @@
                         i.setMaxSize(max);
 
-                _frameName.setPosition(FrameGraphics.getMaxFrameSize().width
-                                - _frameName.getBoundsWidth() - Item.MARGIN_RIGHT
-                                - org.expeditee.io.Conversion.X_ADJUST,
-                                org.expeditee.io.Conversion.Y_ADJUST);
+                _frameName.resetFrameNamePosition();
         }
 
@@ -1156 +1147 @@
                                 ItemUtils.TAG_LINE_TEMPLATE);
                 float thickness = template.getThickness();
-                if(thickness > 0)
+                if (thickness > 0)
                         dot.setThickness(template.getThickness());
+                if (template.getLinePattern() != null)
+                        dot.setLinePattern(template.getLinePattern());
                 dot.setColor(template.getColor());
                 // reset attributes