Changeset 1102 for trunk/src/org/apollo/gui/PlaybackControlPopup.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/apollo/gui/PlaybackControlPopup.java (modified) (19 diffs)

trunk/src/org/apollo/gui/PlaybackControlPopup.java

@@ -2 +2 @@
 
 import java.awt.Dimension;
+import java.awt.Graphics2D;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
@@ -8 +9 @@
 import java.awt.event.ActionListener;
 
-import javax.swing.Icon;
 import javax.swing.JButton;
+import javax.swing.JPanel;
 import javax.swing.JSlider;
 import javax.swing.JToggleButton;
@@ -16 +17 @@
 
 import org.apollo.io.IconRepository;
+import org.expeditee.core.Image;
+import org.expeditee.core.bounds.AxisAlignedBoxBounds;
+import org.expeditee.gio.swing.SwingConversions;
+import org.expeditee.gio.swing.SwingMiscManager;
 import org.expeditee.gui.Popup;
+import org.expeditee.gui.PopupManager.ExpandShrinkAnimator;
 
 /**
@@ -25 +31 @@
  *
  */
-public abstract class PlaybackControlPopup extends Popup implements ActionListener {
-
+public abstract class PlaybackControlPopup extends Popup implements ActionListener
+{
+        public JPanel panel;
         public JButton playPauseButton;
         public JButton stopButton;
@@ -39 +46 @@
         private static final int BUTTON_SIZE = 40;
         
-        protected PlaybackControlPopup() {
-                super(new GridBagLayout());
+        protected PlaybackControlPopup()
+        {
+                super(new ExpandShrinkAnimator());
+                
+                panel = new JPanel(new GridBagLayout());
                 
                 playPauseButton = new JButton();
                 playPauseButton.setActionCommand("playpause");
                 playPauseButton.addActionListener(this);
-                playPauseButton.setIcon(IconRepository.getIcon("play.png"));
+                SwingMiscManager.setJButtonIcon(playPauseButton, IconRepository.getIcon("play.png"));
                 playPauseButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
                 playPauseButton.setToolTipText("Play selection / Pause");
@@ -53 +63 @@
                 stopButton.addActionListener(this);
                 stopButton.setActionCommand("stop");
-                stopButton.setIcon(IconRepository.getIcon("stop.png"));
+                SwingMiscManager.setJButtonIcon(stopButton, IconRepository.getIcon("stop.png"));
                 stopButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
                 stopButton.setToolTipText("Stop playback");
@@ -60 +70 @@
                 rewindButton.addActionListener(this);
                 rewindButton.setActionCommand("rewind");
-                rewindButton.setIcon(IconRepository.getIcon("rewind.png"));
+                SwingMiscManager.setJButtonIcon(rewindButton, IconRepository.getIcon("rewind.png"));
                 rewindButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
                 rewindButton.setToolTipText("Rewind to start");
@@ -66 +76 @@
                 // Icon changes
                 muteButton = new JToggleButton();
-                muteButton.setSelectedIcon(IconRepository.getIcon("volmute.png"));
+                SwingMiscManager.setJButtonSelectedIcon(muteButton, IconRepository.getIcon("volmute.png"));
                 muteButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
                 muteButton.setToolTipText("Toggle mute");
@@ -78 +88 @@
                 
                 soloButton = new JToggleButton();
-                soloButton.setIcon(IconRepository.getIcon("solo.png"));
-                soloButton.setSelectedIcon(IconRepository.getIcon("soloon.png"));
+                SwingMiscManager.setJButtonIcon(soloButton, IconRepository.getIcon("solo.png"));
+                SwingMiscManager.setJButtonSelectedIcon(soloButton, IconRepository.getIcon("soloon.png"));
                 soloButton.setPreferredSize(new Dimension(BUTTON_SIZE, BUTTON_SIZE));
                 soloButton.setToolTipText("Toggle solo");
@@ -115 +125 @@
                 c.gridy = 0;
                 c.fill = GridBagConstraints.BOTH;
-                add(playPauseButton, c);
+                panel.add(playPauseButton, c);
                 
                 c = new GridBagConstraints();
@@ -121 +131 @@
                 c.gridy = 0;
                 c.fill = GridBagConstraints.BOTH;
-                add(stopButton, c);
+                panel.add(stopButton, c);
                 
                 c = new GridBagConstraints();
@@ -127 +137 @@
                 c.gridy = 0;
                 c.fill = GridBagConstraints.BOTH;
-                add(rewindButton, c);
+                panel.add(rewindButton, c);
                 
                 c = new GridBagConstraints();
@@ -133 +143 @@
                 c.gridy = 0;
                 c.fill = GridBagConstraints.BOTH;
-                add(soloButton, c);
+                panel.add(soloButton, c);
                 
                 c = new GridBagConstraints();
@@ -139 +149 @@
                 c.gridy = 0;
                 c.fill = GridBagConstraints.BOTH;
-                add(muteButton, c);
+                panel.add(muteButton, c);
                 
                 c = new GridBagConstraints();
@@ -146 +156 @@
                 c.fill = GridBagConstraints.BOTH;
                 c.insets = new Insets(0,VOLUME_SPACING,0,VOLUME_SPACING);
-                add(volumeSlider, c);
+                panel.add(volumeSlider, c);
                 
                 c = new GridBagConstraints();
@@ -152 +162 @@
                 c.gridy = 0;
                 c.fill = GridBagConstraints.BOTH;
-                add(miscButton, c);
+                panel.add(miscButton, c);
                 
 //
@@ -201 +211 @@
 //              this.setSize(BUTTON_SIZE * 4, BUTTON_SIZE * 2);
                 
-                this.setSize(BUTTON_SIZE * 8, BUTTON_SIZE);
-                
-                this.doLayout();
+                panel.setSize(BUTTON_SIZE * 8, BUTTON_SIZE);
+                
+                panel.doLayout();
                 
         }
@@ -213 +223 @@
         private void updateButtonGUI() {
                 
-                Icon newIcon = null;
+                Image newIcon = null;
                 if (volumeSlider.getValue() <= 25) 
                                 newIcon = IconRepository.getIcon("vol25.png");
@@ -223 +233 @@
                                 newIcon = IconRepository.getIcon("vol100.png");
                 
-                muteButton.setIcon(newIcon);
-        }
-
-
+                SwingMiscManager.setJButtonIcon(muteButton, newIcon);
+        }
+        
+        @Override
+        protected void paintInternal()
+        {
+                Graphics2D g = SwingMiscManager.getIfUsingSwingGraphicsManager().getCurrentSurface();
+                AxisAlignedBoxBounds bounds = getBounds();
+                
+                g.translate(bounds.getMinX(), bounds.getMinY());
+                panel.paint(g);
+                g.translate(-bounds.getMinX(), -bounds.getMinY());
+        }
+
+        @Override
+        public AxisAlignedBoxBounds getFullBounds()
+        {
+                return SwingConversions.fromSwingRectangle(panel.getBounds());
+        }
+        
         public abstract void actionPerformed(ActionEvent e);