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

trunk/src/org/expeditee/items/widgets/WidgetCorner.java

@@ -19 +19 @@
 package org.expeditee.items.widgets;
 
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.Polygon;
 import java.util.List;
 
+import org.expeditee.core.Colour;
+import org.expeditee.core.Point;
+import org.expeditee.core.bounds.PolygonBounds;
 import org.expeditee.items.Dot;
 import org.expeditee.items.ItemParentStateChangedEvent;
@@ -30 +30 @@
 public class WidgetCorner extends Dot {
 
-        private InteractiveWidget _widgetSource;
-
-        WidgetCorner(int x, int y, int id, InteractiveWidget widgetSource) {
+        private Widget _widgetSource;
+
+        WidgetCorner(int x, int y, int id, Widget widgetSource) {
                 super(x, y, id);
 
@@ -38 +38 @@
                         throw new NullPointerException("widgetSource");
                 _widgetSource = widgetSource;
-        }
-
-        @Override
-        public void updatePolygon() {
-                super.updatePolygon();
-                if (_widgetSource != null)
-                        _widgetSource.onBoundsChanged();
         }
 
@@ -81 +74 @@
 
         @Override
-        public void onParentStateChanged(ItemParentStateChangedEvent e) {
+        public void onParentStateChanged(ItemParentStateChangedEvent e)
+        {
                 super.onParentStateChanged(e);
                 _widgetSource.onParentStateChanged(e);
         }
 
-        public InteractiveWidget getWidgetSource() {
+        public Widget getWidgetSource() {
                 return _widgetSource;
         }
 
         @Override
-        public void paint(Graphics2D g) {
+        public void paint()
+        {
                 // For fixed widgets, always have corner selected with connected context
-                HighlightMode tmp = _mode; // save mode
-                if (_mode == HighlightMode.Normal && _widgetSource.isFixedSize()) {
-                        _mode = HighlightMode.Connected; // draw as connected context for
+                HighlightMode tmp = _highlightMode; // save mode
+                if (_highlightMode == HighlightMode.Normal && _widgetSource.isFixedSize()) {
+                        _highlightMode = HighlightMode.Connected; // draw as connected context for
                         // fixed widgets
                 }
-                super.paint(g);
-                _mode = tmp; // restore mode
-        }
-
-        @Override
-        public void paintFill(Graphics2D g) {
-                _widgetSource.paintFill(g); // only paints a fill if floating
+                super.paint();
+                _highlightMode = tmp; // restore mode
+        }
+
+        @Override
+        public void paintFill() {
+                _widgetSource.paintFill(); // only paints a fill if floating
         }
 
@@ -127 +122 @@
 
         @Override
-        public void setArrowhead(Polygon arrow) {
+        public void setArrowhead(PolygonBounds arrow) {
         }
 
@@ -139 +134 @@
 
         @Override
-        public void setBackgroundColor(Color c) {
+        public void setBackgroundColor(Colour c) {
                 if (_widgetSource != null) {
                         super.setBackgroundColor(c);
@@ -147 +142 @@
 
         @Override
-        public void setBottomShadowColor(Color bottom) {
-        }
-
-        @Override
-        public void setFillColor(Color c) {
+        public void setBottomShadowColor(Colour bottom) {
+        }
+
+        @Override
+        public void setFillColor(Colour c) {
         }
 
@@ -186 +181 @@
         }
 
-        public void setAnchorCornerX(Float anchorLeft, Float anchorRight) {
-                _anchorLeft = anchorLeft;
-                _anchorRight = anchorRight;
-        }
-        
-        public void setAnchorCornerY(Float anchorTop, Float anchorBottom) {
-                _anchorTop = anchorTop;
-                _anchorBottom= anchorBottom;
-        }
-        
-        @Override
-        public void setAnchorLeft(Float anchor) {
+        public void setAnchorCornerX(Integer anchorLeft, Integer anchorRight)
+        {
+                _anchoring.setLeftAnchor(anchorLeft);
+                _anchoring.setRightAnchor(anchorRight);
+        }
+        
+        public void setAnchorCornerY(Integer anchorTop, Integer anchorBottom)
+        {
+                _anchoring.setTopAnchor(anchorTop);
+                _anchoring.setBottomAnchor(anchorBottom);
+        }
+        
+        @Override
+        public void setAnchorLeft(Integer anchor) {
                 _widgetSource.setAnchorLeft(anchor);
-                _anchorLeft = anchor;
-                _anchorRight = null;
-        }
-
-        @Override
-        public void setAnchorRight(Float anchor) {
+                _anchoring.setLeftAnchor(anchor);
+        }
+
+        @Override
+        public void setAnchorRight(Integer anchor) {
                 _widgetSource.setAnchorRight(anchor);
-                _anchorLeft = null;
-                _anchorRight = anchor;
-        }
-        
-        @Override
-        public void setAnchorTop(Float anchor) {
+                _anchoring.setRightAnchor(anchor);
+        }
+        
+        @Override
+        public void setAnchorTop(Integer anchor) {
                 _widgetSource.setAnchorTop(anchor);
-                _anchorTop = anchor;
-                _anchorBottom = null;
-        }
-
-        @Override
-        public void setAnchorBottom(Float anchor) {
+                _anchoring.setTopAnchor(anchor);
+        }
+
+        @Override
+        public void setAnchorBottom(Integer anchor) {
                 _widgetSource.setAnchorBottom(anchor);
-                _anchorTop = null;
-                _anchorBottom = anchor;
+                _anchoring.setBottomAnchor(anchor);
         }
         
@@ -251 +244 @@
 
         @Override
-        public boolean contains(int x, int y) {
-                return super.contains(x, y)
-                                && !_widgetSource.getBounds().contains(x, y);
+        public boolean contains(Point p)
+        {
+                return super.contains(p) && !_widgetSource.getBounds().contains(p);
         }
 
@@ -268 +261 @@
 
         @Override
-        public void setColor(Color color) {
+        public void setColor(Colour color) {
                 if (_widgetSource != null) {
                         super.setColor(color);