Changeset 1102 for trunk/src/org/apollo/widgets/TrackWidgetCommons.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/widgets/TrackWidgetCommons.java (modified) (3 diffs)

trunk/src/org/apollo/widgets/TrackWidgetCommons.java

@@ -1 +1 @@
 package org.apollo.widgets;
 
-import java.awt.Color;
-import java.awt.Font;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Font;
 
 public final class TrackWidgetCommons {
-        private TrackWidgetCommons() {
+        
+        /** Static-only class. */
+        private TrackWidgetCommons()
+        {
         }
         
@@ -17 +20 @@
         public static final int CACHE_DEPTH = 1;
         
-        public static final Color FREESPACE_TRACKNAME_TEXT_COLOR = Color.WHITE;
-        public static final Font FREESPACE_TRACKNAME_FONT = new Font("Arial", Font.BOLD, 20);
+        public static final Colour FREESPACE_TRACKNAME_TEXT_COLOR = Colour.WHITE;
+        public static final Font FREESPACE_TRACKNAME_FONT = new Font("Arial", Font.Style.BOLD, 20);
         
         public static final int POPUP_LIFETIME = 1500;
         
-        public static final Color STANDARD_TRACK_EDGE_COLOR = Color.BLACK;
-        public static final Color MUTED_TRACK_EDGE_COLOR = Color.GRAY;
-        public static final Color SOLO_TRACK_EDGE_COLOR = Color.RED;
-        public static final Color MUTED_SOLO_TRACK_EDGE_COLOR = new Color(255, 168, 168);
+        public static final Colour STANDARD_TRACK_EDGE_COLOR = Colour.BLACK;
+        public static final Colour MUTED_TRACK_EDGE_COLOR = Colour.GREY;
+        public static final Colour SOLO_TRACK_EDGE_COLOR = Colour.RED;
+        public static final Colour MUTED_SOLO_TRACK_EDGE_COLOR = Colour.FromRGB255(255, 168, 168);
         
         public static final float STOPPED_TRACK_EDGE_THICKNESS = 1.0f;
@@ -31 +34 @@
         
 
-        public static Color getBorderColor(boolean isSolo, boolean isMuted) {
+        public static Colour getBorderColor(boolean isSolo, boolean isMuted) {
                 
-                Color newC = null;
+                Colour newC = null;
                 
                 if (isSolo && isMuted) {