Changeset 729 for trunk/src/org/expeditee/gui/FrameKeyboardActions.java

Timestamp:

01/21/14 11:59:05 (10 years ago)

Author:

jts21

Message:

Move ColorWheels to UserSettings, store them as new ArraySetting type that handles default values (so now ColorWheels have defaults if you unlink their setting)

File:

• trunk/src/org/expeditee/gui/FrameKeyboardActions.java (modified) (3 diffs)

trunk/src/org/expeditee/gui/FrameKeyboardActions.java

@@ -1791 +1791 @@
                         color = null;
                 else
-                        color = ColorUtils.getNextColor(color, Item.FILL_COLOR_WHEEL, toSet
+                        color = ColorUtils.getNextColor(color, UserSettings.FillColorWheel.get(), toSet
                                         .getGradientColor());
 
@@ -1819 +1819 @@
                         color = null;
                 else
-                        color = ColorUtils.getNextColor(color, Item.COLOR_WHEEL, toSet
+                        color = ColorUtils.getNextColor(color, UserSettings.ColorWheel.get(), toSet
                                         .getFillColor());
 
@@ -1900 +1900 @@
                         color = null;
                 else if (setBackgroundColor) {
-                        color = ColorUtils.getNextColor(color, Item.FILL_COLOR_WHEEL, item
+                        color = ColorUtils.getNextColor(color, UserSettings.FillColorWheel.get(), item
                                         .getPaintColor());
                 } else {
-                        color = ColorUtils.getNextColor(color, Item.COLOR_WHEEL,
+                        color = ColorUtils.getNextColor(color, UserSettings.ColorWheel.get(),
                                         currentFrame.getPaintBackgroundColor());
                 }