Changeset 1005

Timestamp:

03/06/16 15:08:29 (8 years ago)

Author:

davidb

Message:

Change to allow SVG buttons to be resizeable. Also tidy up of import statements

Location:

trunk/src/org/expeditee/items/widgets

Files:

• ButtonWidget.java (modified) (4 diffs)
• RefreshButton.java (modified) (2 diffs)
• RubbishBin.java (modified) (2 diffs)
• Undo.java (modified) (2 diffs)

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

@@ -3 +3 @@
 import java.awt.Color;
 import java.awt.Dimension;
-import java.io.File;
 import java.net.URL;
 
@@ -9 +8 @@
 import javax.swing.JPanel;
 import javax.swing.border.EmptyBorder;
+
 import org.expeditee.items.Text;
+
 import com.kitfox.svg.app.beans.SVGIcon;
 
@@ -15 +16 @@
 public class ButtonWidget extends InteractiveWidget{
 
-        JButton clicked = new JButton("");      
-                
+        protected JButton clicked_ = new JButton("");   
+        protected SVGIcon icon_ = null;
+        
         public ButtonWidget(int dimension, String filePath, Text source, String[] args)
         {
                 //Controls how the widget is displayed
-                super(source, new JPanel(new BorderLayout()), 80, 80, 80, 80);  
+                super(source, new JPanel(new BorderLayout()), 80, -1, 80, -1);  
                                 
-                clicked.setBorder(new EmptyBorder(0, 0, 0, 0));
-                clicked.setBackground(Color.white);
+                clicked_.setBorder(new EmptyBorder(0, 0, 0, 0));
+                clicked_.setBackground(Color.white);
                 
-                SVGIcon icon = null;
                 Dimension size = new Dimension(dimension, dimension);
-                icon = new SVGIcon();
+                icon_ = new SVGIcon();
                 try{
                         URL imageURL = ClassLoader.getSystemResource(filePath);         
-                        icon.setSvgURI(imageURL.toURI());
+                        icon_.setSvgURI(imageURL.toURI());
                         //This STILL works, unsure why. Don't remove it has an affect on the button appearance.         
-                        icon.setUseAntiAlias(true);
-                        icon.setScaleToFit(true);
-                        icon.setPreferredSize(size);
-                        clicked.setIcon(icon);
-                        _swingComponent.add(clicked);
+                        icon_.setUseAntiAlias(true);
+                        icon_.setScaleToFit(true);
+                        icon_.setPreferredSize(size);
+                        clicked_.setIcon(icon_);
+                        _swingComponent.add(clicked_);
                         this.setWidgetEdgeThickness(0.0f);
                         this.setWidgetEdgeColor(Color.white);   
@@ -60 +61 @@
         }
 
+        @Override
+        boolean setPositions(WidgetCorner src, float x, float y) {
+                boolean result = super.setPositions(src, x, y);
+
+                int iw_x_dim = getWidth();
+                int iw_y_dim = getHeight();
+
+                icon_.setPreferredSize(new Dimension(iw_x_dim, iw_y_dim));
+
+                return result;
+        }
 }

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

@@ -3 +3 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
+
 import org.expeditee.gui.DisplayIO;
 import org.expeditee.gui.Frame;
 import org.expeditee.gui.FrameGraphics;
 import org.expeditee.gui.FrameIO;
-import org.expeditee.gui.FrameMouseActions;
-import org.expeditee.gui.FreeItems;
-import org.expeditee.items.Item;
 import org.expeditee.items.Text;
 
@@ -20 +17 @@
                 super(78, "org/expeditee/assets/images/reset.svg", source, args);
                 
-                clicked.addActionListener(new ActionListener() {
+                clicked_.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {                    
                  

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

@@ -3 +3 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
 
 import org.expeditee.gui.DisplayIO;
@@ -18 +17 @@
                 super(80, "org/expeditee/assets/images/bin.svg", source, args);
 
-                clicked.addActionListener(new ActionListener() {
+                clicked_.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {    
                         

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

@@ -3 +3 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
-import java.io.File;
-import java.net.URL;
 
 import org.expeditee.gui.DisplayIO;
@@ -16 +14 @@
                 super(120, "org/expeditee/assets/images/undo.svg", source, args);               
                 
-                clicked.addActionListener(new ActionListener() {
+                clicked_.addActionListener(new ActionListener() {
                 public void actionPerformed(ActionEvent e) {