Changeset 1102 for trunk/src/org/expeditee/gui/FrameCreator.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

• trunk/src/org/expeditee/gui/FrameCreator.java (modified) (8 diffs)

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

@@ -19 +19 @@
 package org.expeditee.gui;
 
-import java.awt.Color;
-import java.util.*;
+import java.util.LinkedList;
+import java.util.List;
 
 import org.expeditee.agents.ExistingFramesetException;
+import org.expeditee.core.Colour;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 
 public class FrameCreator {
+        
         public static final int INDENT_FROM_TITLE = 20;
 
@@ -60 +62 @@
 
         public FrameCreator(String frameTitle) {
-                this(DisplayIO.getCurrentFrame().getFramesetName(), DisplayIO
+                this(DisplayController.getCurrentFrame().getFramesetName(), DisplayController
                                 .getCurrentFrame().getPath(), frameTitle, false, false);
         }
@@ -83 +85 @@
          * @return the newly created button.
          */
-        public static Item createButton(String text, Float x, Float y, Float right,
-                        Float bottom) {
+        public static Item createButton(String text, Integer x, Integer y, Integer right,
+                        Integer bottom) {
                 Text button = new Text(text);
 
-                button.setBackgroundColor(Color.LIGHT_GRAY);
-                button.setBorderColor(Color.DARK_GRAY);
+                button.setBackgroundColor(Colour.LIGHT_GREY);
+                button.setBorderColor(Colour.DARK_GREY);
                 button.setThickness(2.0F);
                 if (bottom != null)
@@ -99 +101 @@
                         button.setY(y);
 
-                button.updatePolygon();
+                button.invalidateBounds();
 
                 return button;
         }
 
-        public FrameCreator(String name, String path, String frameTitle,
-                        boolean recreate, boolean multiColumn) {
+        public FrameCreator(String name, String path, String frameTitle, boolean recreate, boolean multiColumn)
+        {
                 _multiColumn = multiColumn;
-                _Mnext = createButton("@Next", null, null, 10F, 15F);
+                _Mnext = createButton("@Next", null, null, 10, 15);
 
                 _Mprev = createButton("@Previous", null, null, _Mnext.getBoundsWidth()
-                                + _Mnext.getAnchorRight() + 20F, 15F);
+                                + _Mnext.getAnchorRight() + 20, 15);
 
                 _Mfirst = createButton("@First", null, null, _Mprev.getBoundsWidth()
-                                + _Mprev.getAnchorRight() + 20F, 15F);
+                                + _Mprev.getAnchorRight() + 20, 15);
 
                 Frame toUse = null;
@@ -180 +182 @@
         }
 
-        private void resetGlobals(Frame toUse) {
+        private void resetGlobals(Frame toUse)
+        {
                 Text title = toUse.getTitleItem();
                 START_X = INDENT_FROM_TITLE + title.getX();
@@ -217 +220 @@
                                 // new frame
                                 if (!_multiColumn
-                                                || toAdd.getBoundsWidth() + _lastX > FrameGraphics
-                                                                .getMaxSize().width) {
+                                                || toAdd.getBoundsWidth() + _lastX > DisplayController.getFramePaintArea().getWidth()) {
                                         // Make sure text items that are created on the current
                                         // frame are removed
@@ -229 +231 @@
                         toAdd.setOffset(0, 0);
                         toAdd.setID(_current.getNextItemID());
-                        toAdd.setRightMargin(FrameGraphics.getMaxFrameSize().width, true);
+                        toAdd.setRightMargin(DisplayController.getFramePaintArea().getWidth(), true);
 
                         _current.addItem(toAdd);
@@ -245 +247 @@
         }
 
-        public Text addText(String toAdd, Color c, String link, String action,
+        public Text addText(String toAdd, Colour c, String link, String action,
                         boolean bSave) {
                 Text text = _current.createNewText(toAdd);