From 17fd84c52658502ae2c129f86631db9299e8dad2 Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Tue, 10 Mar 2020 10:27:29 +0100 Subject: [PATCH] IDEA-234565 Settings "Choose Color" - allow paste hex color with # prefix GitOrigin-RevId: 6354810ee5cd06dac0945bcda952b5ebe17eda72 --- .../platform-impl/src/com/intellij/ui/ColorPicker.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java index a581800f31fc..86e2eafca715 100644 --- a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java +++ b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java @@ -812,11 +812,12 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen } @Override public void insertString(int offs, String str, AttributeSet a) throws BadLocationException { + str = StringUtil.trimStart(str, "#"); final boolean rgb = isRGBMode(); char[] source = str.toCharArray(); if (mySrc != null) { final int selected = mySrc.getSelectionEnd() - mySrc.getSelectionStart(); - int newLen = mySrc.getText().length() - selected + str.length(); + int newLen = mySrc.getText().length() - selected + str.length(); if (newLen > (myHex ? 6 : 3)) { Toolkit.getDefaultToolkit().beep(); return; @@ -842,9 +843,10 @@ public class ColorPicker extends JPanel implements ColorListener, DocumentListen Toolkit.getDefaultToolkit().beep(); return; } - } else { + } + else { if ((mySrc == myRed && num > 359) - || ((mySrc == myGreen || mySrc == myBlue) && num > 100)) { + || ((mySrc == myGreen || mySrc == myBlue) && num > 100)) { Toolkit.getDefaultToolkit().beep(); return; }