Changeset 1102 for trunk/src/org/expeditee/items/XRayable.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/items/XRayable.java (modified) (12 diffs)

trunk/src/org/expeditee/items/XRayable.java

@@ -19 +19 @@
 package org.expeditee.items;
 
-import java.awt.Color;
-import java.awt.geom.Point2D;
 import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 
+import org.expeditee.core.Colour;
+import org.expeditee.core.Point;
+import org.expeditee.gui.DisplayController;
 import org.expeditee.gui.FrameGraphics;
 
@@ -101 +102 @@
         
         @Override
-        public Color getColor() {
+        public Colour getColor() {
                 return _source.getColor();
         }
 
         @Override
-        public void setColor(Color c) {
+        public void setColor(Colour c) {
                 _source.setColor(c);
                 invalidateCommonTrait(ItemAppearence.ForegroundColorChanged);
@@ -112 +113 @@
         
         @Override
-        public void setBackgroundColor(Color c) {
+        public void setBackgroundColor(Colour c) {
                 _source.setBackgroundColor(c);
         }
         
         @Override
-        public void setFillColor(Color c) {
+        public void setFillColor(Colour c) {
                 _source.setFillColor(c);
         }
         
         @Override
-        public void setBorderColor(Color c) {
+        public void setBorderColor(Colour c) {
                 _source.setBorderColor(c);
                 invalidateCommonTrait(ItemAppearence.BorderColorChanged);
@@ -128 +129 @@
         
         @Override
-        public void setGradientColor(Color c) {
+        public void setGradientColor(Colour c) {
                 _source.setGradientColor(c);
         }
@@ -153 +154 @@
         
         @Override
-        public Float getAnchorLeft() {
+        public Integer getAnchorLeft() {
                 return _source.getAnchorLeft();
         }
         
         @Override
-        public Float getAnchorRight() {
+        public Integer getAnchorRight() {
                 return _source.getAnchorRight();
         }
 
         @Override
-        public Float getAnchorTop() {
+        public Integer getAnchorTop() {
                 return _source.getAnchorTop();
         }
 
         @Override
-        public Float getAnchorBottom() {
+        public Integer getAnchorBottom() {
                 return _source.getAnchorBottom();
         }
@@ -174 +175 @@
         
         @Override
-        public Color getBorderColor() {
+        public Colour getBorderColor() {
                 return _source.getBorderColor();
         }
@@ -186 +187 @@
         
         @Override
-        public Color getBackgroundColor() {
+        public Colour getBackgroundColor() {
                 return _source.getBackgroundColor();
         }
         
         @Override
-        public Color getFillColor() {
+        public Colour getFillColor() {
                 return _source.getFillColor();
         }
         
         @Override
-        public Color getGradientColor() {
+        public Colour getGradientColor() {
                 return _source.getGradientColor();
         }
@@ -226 +227 @@
                         invalidateAll();
                 _source.setLink(frameName);
-                updatePolygon();
+                invalidateBounds();
                 //TODO: only invalidate the link bit
                 invalidateAll();
@@ -239 +240 @@
                         invalidateAll();
                 _source.setActions(action);
-                updatePolygon();
+                invalidateBounds();
                 invalidateAll();
         }
@@ -252 +253 @@
         
         @Override
-        public void translate(Point2D origin, double ratio){
+        public void translate(Point origin, double ratio){
                 //_source.translate(origin, ratio);
-                updatePolygon();
+                invalidateBounds();
         }
         
@@ -279 +280 @@
 
         @Override
-        public void setAnchorTop(Float anchor) {
+        public void setAnchorTop(Integer anchor) {
                 _source.setAnchorTop(anchor);
                 if (anchor != null)
@@ -286 +287 @@
 
         @Override
-        public void setAnchorBottom(Float anchor) {
+        public void setAnchorBottom(Integer anchor) {
                 _source.setAnchorBottom(anchor);
                 if (anchor != null)
-                        _source.setY(FrameGraphics.getMaxFrameSize().height - getHeight() - anchor);
-        }
-
-        
-        @Override
-        public void setAnchorLeft(Float anchor) {
+                        _source.setY(DisplayController.getFramePaintArea().getHeight() - getHeight() - anchor);
+        }
+
+        
+        @Override
+        public void setAnchorLeft(Integer anchor) {
                 _source.setAnchorLeft(anchor);
         }
 
         @Override
-        public void setAnchorRight(Float anchor) {
+        public void setAnchorRight(Integer anchor) {
                 _source.setAnchorRight(anchor);
-                _source.setX(FrameGraphics.getMaxFrameSize().width - anchor - this.getWidth());
+                _source.setX(DisplayController.getFramePaintArea().getWidth() - anchor - this.getWidth());
         }