From 3ec7d9ab4a33ed8b25019f6ff9b4f1ec0d294251 Mon Sep 17 00:00:00 2001
From: weisj <weisj@arcor.de>
Date: Wed, 2 Oct 2019 12:45:30 +0200
Subject: [PATCH] Fixed Hex field in color chooser loosing value when focus is
 lost.

---
 .../ui/colorchooser/ColorValueFormatter.java  | 41 ++++++++++++++-----
 .../colorchooser/DarkColorChooserPanel.java   |  9 +++-
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/weis/darklaf/ui/colorchooser/ColorValueFormatter.java b/src/main/java/com/weis/darklaf/ui/colorchooser/ColorValueFormatter.java
index 17c63ee7..3f132695 100644
--- a/src/main/java/com/weis/darklaf/ui/colorchooser/ColorValueFormatter.java
+++ b/src/main/java/com/weis/darklaf/ui/colorchooser/ColorValueFormatter.java
@@ -1,8 +1,10 @@
 package com.weis.darklaf.ui.colorchooser;
 
 import com.weis.darklaf.color.DarkColorModel;
+import com.weis.darklaf.util.StringUtil;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.kotlin.ir.expressions.IrConstKind;
 
 import javax.swing.*;
 import javax.swing.text.AttributeSet;
@@ -55,7 +57,7 @@ public final class ColorValueFormatter extends JFormattedTextField.AbstractForma
         public void insertString(@NotNull final FilterBypass fb, final int offset,
                                  @NotNull final String text, final AttributeSet set) throws BadLocationException {
             if (isValid(fb.getDocument().getLength() + text.length())
-                && isValid(text)) {
+                    && isValid(text)) {
                 var newText = new StringBuilder(fb.getDocument().getText(0, fb.getDocument().getLength()));
                 newText.insert(offset, text);
                 if (hex || isValidValue(newText.toString())) {
@@ -112,15 +114,24 @@ public final class ColorValueFormatter extends JFormattedTextField.AbstractForma
                 return model.getDefault(fieldIndex);
             }
             if (hex) {
-                return String.format("%-8s", text).replace(' ', '0');
-            }
-            var value = Integer.valueOf(text, this.radix);
-            var min = model.getMinimum(fieldIndex);
-            var max = model.getMaximum(fieldIndex);
-            if (value > max || value < min) {
-                throw new ParseException("Value not in range [" + min + "," + max + "]", 0);
+                var hexStr = text;
+                if (hexStr.length() == 6) {
+                    hexStr += "FF";
+                }
+                int r = Integer.valueOf(hexStr.substring(0, 2), 16);
+                checkRange(r, 0, 255);
+                int g = Integer.valueOf(hexStr.substring(2, 4), 16);
+                checkRange(g, 0, 255);
+                int b = Integer.valueOf(hexStr.substring(4, 6), 16);
+                checkRange(b, 0, 255);
+                return Integer.valueOf(text, radix);
+            } else {
+                var value = Integer.valueOf(text, this.radix);
+                var min = model.getMinimum(fieldIndex);
+                var max = model.getMaximum(fieldIndex);
+                checkRange(value, min, max);
+                return value;
             }
-            return ((Number) value).intValue();
         } catch (NumberFormatException nfe) {
             ParseException pe = new ParseException("illegal format", 0);
             pe.initCause(nfe);
@@ -128,12 +139,22 @@ public final class ColorValueFormatter extends JFormattedTextField.AbstractForma
         }
     }
 
+    protected void checkRange(final int value, final int min, final int max) throws ParseException {
+        if (value > max || value < min) {
+            throw new ParseException("Value not in range [" + min + "," + max + "]", 0);
+        }
+    }
+
+    @Contract("null -> fail")
     @Override
     public String valueToString(final Object object) throws ParseException {
         if (object instanceof Integer) {
-            if (this.radix == 10) {
+            if (radix == 10) {
                 return object.toString();
             }
+            if (hex) {
+                return StringUtil.toUpperCase(Integer.toHexString((Integer) object));
+            }
             int value = (Integer) object;
             int index = getLength();
             char[] array = new char[index];
diff --git a/src/main/java/com/weis/darklaf/ui/colorchooser/DarkColorChooserPanel.java b/src/main/java/com/weis/darklaf/ui/colorchooser/DarkColorChooserPanel.java
index b2f72eaf..8349fbf8 100644
--- a/src/main/java/com/weis/darklaf/ui/colorchooser/DarkColorChooserPanel.java
+++ b/src/main/java/com/weis/darklaf/ui/colorchooser/DarkColorChooserPanel.java
@@ -11,6 +11,8 @@ import javax.swing.colorchooser.AbstractColorChooserPanel;
 import javax.swing.event.AncestorEvent;
 import javax.swing.event.AncestorListener;
 import java.awt.*;
+import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
 import java.awt.event.KeyEvent;
 
 public class DarkColorChooserPanel extends AbstractColorChooserPanel implements ColorListener {
@@ -329,12 +331,15 @@ public class DarkColorChooserPanel extends AbstractColorChooserPanel implements
     }
 
     private void applyColorToHEX(@NotNull final Color c) {
+        boolean changingOld = isChanging;
+        isChanging = true;
         boolean transparencyEnabled = isColorTransparencySelectionEnabled();
         if (transparencyEnabled) {
-            textHex.setText(String.format("%02X%02X%02X%02X", c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()));
+            textHex.setValue(c.getRGB());
         } else {
-            textHex.setText(String.format("%02X%02X%02X", c.getRed(), c.getGreen(), c.getBlue()));
+            textHex.setValue(new Color(c.getRed(), c.getGreen(), c.getBlue()).getRGB());
         }
+        isChanging = changingOld;
     }
 
     private void applyColorToFields(final Color color) {