Changeset 1177 for trunk/src/org/expeditee/items/widgets/Widget.java

Timestamp:

09/28/18 10:33:02 (6 years ago)

Author:

bln4

Message:

The following commit comments all relate to work undertaken getting widgets working in the new refactored code.
org.expeditee.items.widgets.JavaFXWidget ->
org.expeditee.items.widgets.SwingWidget ->
org.expeditee.items.widgets.Widget ->

Some additional abstract piping. While the concrete implementation for this code has been added to SwingWidget's, it has not been properly done in JavaFXWidget

org.expeditee.items.widgets.WidgetCorner ->

WidgetCorner's updateBounds() reimplemented.

File:

• trunk/src/org/expeditee/items/widgets/Widget.java (modified) (4 diffs)

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

@@ -542 +542 @@
                 }
                 
+                //addThisAsContainerListenerToContent();
+                //addKeyListenerToWidget();
+                
                 _textRepresentation = source;
 
@@ -1113 +1116 @@
                         case ItemParentStateChangedEvent.EVENT_TYPE_SHOWN_VIA_OVERLAY:
                                 EcosystemManager.addInteractiveWidget(this);
+                                addWidgetContent(e);
                                 break;
                 }
 
-                DisplayController.invalidateItem(_d1, getBounds());
+                DisplayController.invalidateItem(_d1, getContentBounds());
 
                 // Forward filtered event to upper classes...
                 onParentStateChanged(e.getEventType());
         }
-
+        
+        /**
+         * Subclassing Widgets overwrite to add their specific content to the Frame.
+         * For example, a widget being Java Swing must add their Swing component to Expeditee's content pane.
+         * @param e Can be used to identify if it is appropriate to draw the widget. 
+         */
+        abstract protected void addWidgetContent(final ItemParentStateChangedEvent e);
+        
+        /**
+         * Subclassing Widgets overwrite to specify their own functionality as to how key events
+         * are to be forwarded to Expeditee.
+         */
+        abstract protected void addKeyListenerToWidget();
+        
+        /**
+         * Subclassing widgets overwrite to specify how content will respond to being added and removed.
+         */
+        abstract protected void addThisAsContainerListenerToContent();
+        
+        /**
+         * Subclassing widgets overwrite to provide the size and position of their content.
+         * For example, a widget using Java Swing might return _swingComponent.getBounds().
+         * @return The bounds of the content that is being drawn.
+         */
+        abstract public AxisAlignedBoxBounds getContentBounds();
+        
+        /**
+         * Due to absolute positioning...
+         * @param parent
+         */
+        abstract protected void layout();
+        
+        /**
+         * Subclassing widgets overwrite  to respond to changes in widget bounds.
+         */
+        abstract protected void onBoundsChanged();
+        
         /**
          * Override to make use of. Internally this is reported once by all corners,
@@ -1154 +1194 @@
         public AxisAlignedBoxBounds getBounds()
         {
-                return new AxisAlignedBoxBounds(getX(), getY(), getWidth(), getHeight());
+                return getContentBounds();
+                //return new AxisAlignedBoxBounds(getX(), getY(), getWidth(), getHeight());
         }
 
@@ -1882 +1923 @@
         public Clip getClip()
         {
-                final Clip clip = new Clip(getBounds());
+                final Clip clip = new Clip(getContentBounds());
                 return clip;
         }
+        
+        public void onResized() {
+                invalidateSelf();
+                onBoundsChanged();
+                layout();
+        }
 }