From 9f40e12109766c52da3044706ad9388d73c30b7a Mon Sep 17 00:00:00 2001
From: tobias <thinkdifferent055@gmail.com>
Date: Wed, 6 Feb 2019 16:27:27 +0100
Subject: [PATCH] Add flat color preview to color picker

---
 .../design/ModernGlobalDesignViewController.java         | 4 ++++
 .../de/tobias/playpad/design/modern/ModernColor.java     | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernGlobalDesignViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernGlobalDesignViewController.java
index 54731d2f..f25aa4ae 100644
--- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernGlobalDesignViewController.java
+++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/design/ModernGlobalDesignViewController.java
@@ -69,6 +69,10 @@ public class ModernGlobalDesignViewController extends NVC {
 		flatDesignCheckbox.selectedProperty().addListener((a, b, c) ->
 		{
 			design.setFlatDesign(c);
+
+			// Update button preview
+			backgroundColorButton.setStyle(getLinearGradientCss(design.getBackgroundColor()));
+			playColorButton.setStyle(getLinearGradientCss(design.getPlayColor()));
 		});
 
 		infoLabelFontSizeComboBox.getItems().addAll(9, 10, 12, 13, 14, 16, 18, 20, 24, 28);
diff --git a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernColor.java b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernColor.java
index 3ba31f29..35f3a55f 100644
--- a/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernColor.java
+++ b/PlayWallCore/src/main/java/de/tobias/playpad/design/modern/ModernColor.java
@@ -1,6 +1,7 @@
 package de.tobias.playpad.design.modern;
 
 import de.tobias.playpad.DisplayableColor;
+import de.tobias.playpad.profile.Profile;
 import de.tobias.playpad.util.FadeableColor;
 import javafx.scene.paint.*;
 
@@ -106,8 +107,12 @@ public enum ModernColor implements DisplayableColor {
 
 	@Override
 	public Paint getPaint() {
-		return new LinearGradient(0, 0, 0, 1, true, CycleMethod.NO_CYCLE, new Stop(0, Color.web(colorHi)),
-				new Stop(1, Color.web(colorLow)));
+		if (Profile.currentProfile().getProfileSettings().getDesign().isFlatDesign()) {
+			return Color.web(paint());
+		} else {
+			return new LinearGradient(0, 0, 0, 1, true, CycleMethod.NO_CYCLE, new Stop(0, Color.web(colorHi)),
+					new Stop(1, Color.web(colorLow)));
+		}
 	}
 
 	public String linearGradient() {
-- 
GitLab