MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-171869 Win10 LaF spinners, texfields, buttons background colors fixed

Browse Source
This commit is contained in:
Kirill Kirichenko
2017-07-03 18:16:27 +03:00
parent 96e237476c
commit b71d1f59f5
7 changed files with 114 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/ide/ui/laf/darcula/DarculaUIUtil.java
+9 -6
View File
@@ -386,16 +386,19 @@ public class DarculaUIUtil {
@Override
public void mouseEntered(MouseEvent e) {
JComponent c = (JComponent)e.getComponent();
c.putClientProperty(hoverProperty, Boolean.TRUE);
repaintComponent.repaint();
setHover((JComponent)e.getComponent(), Boolean.TRUE);
}
@Override
public void mouseExited(MouseEvent e) {
JComponent c = (JComponent)e.getComponent();
c.putClientProperty(hoverProperty, Boolean.FALSE);
repaintComponent.repaint();
setHover((JComponent)e.getComponent(), Boolean.FALSE);
}
private void setHover(JComponent c, Boolean value) {
if (c.isEnabled()) {
c.putClientProperty(hoverProperty, value);
repaintComponent.repaint();
}
}
}
}
platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJButtonUI.java
+6 -1
View File
@@ -95,6 +95,10 @@ public class WinIntelliJButtonUI extends DarculaButtonUI {
c.hasFocus() || bm.isRollover() ? UIManager.getColor("Button.intellij.native.focusedBackgroundColor") :
c.getBackground();
if (!b.isEnabled()) {
g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, DISABLED_ALPHA_LEVEL));
}
g2.setColor(color);
g2.fill(r);
@@ -120,6 +124,8 @@ public class WinIntelliJButtonUI extends DarculaButtonUI {
} else if (b instanceof JBOptionButton) {
rect.x -= JBUI.scale(4);
}
rect.y -= JBUI.scale(1); // Move one pixel up
}
@Override
@@ -145,7 +151,6 @@ public class WinIntelliJButtonUI extends DarculaButtonUI {
Graphics2D g2 = (Graphics2D)g.create();
try {
g2.setColor(UIManager.getColor("Button.disabledText"));
g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, DISABLED_ALPHA_LEVEL));
SwingUtilities2.drawStringUnderlineCharAt(c, g2, text, -1,
textRect.x + getTextShiftOffset(),
textRect.y + metrics.getAscent() + getTextShiftOffset());
platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJSpinnerBorder.java
+27 -30
View File
@@ -22,50 +22,47 @@ import com.intellij.util.ui.JBUI;
import javax.swing.*;
import java.awt.*;
import java.awt.geom.Path2D;
import java.awt.geom.Rectangle2D;
public class WinIntelliJSpinnerBorder extends DarculaSpinnerBorder {
@Override
public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
if (c instanceof JSpinner) {
JSpinner spinner = (JSpinner)c;
if (!(c instanceof JSpinner)) return;
Graphics2D g2 = (Graphics2D)g.create();
try {
g2.translate(x, y);
JSpinner spinner = (JSpinner)c;
Graphics2D g2 = (Graphics2D)g.create();
try {
Rectangle r = new Rectangle(x, y, width, height);
JBInsets.removeFrom(r, JBUI.insets(1, 1, 1, WinIntelliJSpinnerUI.BUTTON_WIDTH - 1));
int bw = JBUI.scale(1);
boolean hover = spinner.getClientProperty(WinIntelliJSpinnerUI.HOVER_PROPERTY) == Boolean.TRUE;
if (c.isEnabled()) {
Path2D border = new Path2D.Double(Path2D.WIND_EVEN_ODD);
boolean hover = spinner.getClientProperty(WinIntelliJSpinnerUI.HOVER_PROPERTY) == Boolean.TRUE;
if (c.isEnabled()) {
if (DarculaSpinnerBorder.isFocused(c) || hover) {
width -= JBUI.scale(WinIntelliJSpinnerUI.BUTTON_WIDTH) - bw;
}
if (DarculaSpinnerBorder.isFocused(c)) {
g2.setColor(UIManager.getColor("TextField.focusedBorderColor"));
} else {
g2.setColor(UIManager.getColor(hover ? "TextField.hoverBorderColor" : "TextField.borderColor"));
}
if (DarculaSpinnerBorder.isFocused(c)) {
g2.setColor(UIManager.getColor("TextField.focusedBorderColor"));
} else {
g2.setColor(UIManager.getColor("Button.intellij.native.borderColor"));
g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.35f));
g2.setColor(UIManager.getColor(hover ? "TextField.hoverBorderColor" : "TextField.borderColor"));
}
border.append(new Rectangle2D.Double(0, 0, width, height), false);
border.append(new Rectangle2D.Double(bw, bw, width - bw*2, height - bw*2), false);
g2.fill(border);
} finally {
g2.dispose();
} else {
g2.setColor(UIManager.getColor("Button.intellij.native.borderColor"));
g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.35f));
}
Path2D border = new Path2D.Double(Path2D.WIND_EVEN_ODD);
border.append(r, false);
Rectangle innerRect = new Rectangle(r);
JBInsets.removeFrom(innerRect, JBUI.insets(1));
border.append(innerRect, false);
g2.fill(border);
} finally {
g2.dispose();
}
}
@Override
public Insets getBorderInsets(Component c) {
return new JBInsets(1, 1, 1, 1).asUIResource();
return new JBInsets(2, 2, 2, 2).asUIResource();
}
}
platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJSpinnerUI.java
+63 -25
View File
@@ -15,9 +15,9 @@
*/
package com.intellij.ide.ui.laf.intellij;
import com.intellij.ide.ui.laf.darcula.ui.DarculaSpinnerBorder;
import com.intellij.ide.ui.laf.darcula.ui.DarculaSpinnerUI;
import com.intellij.util.ui.JBDimension;
import com.intellij.util.ui.JBInsets;
import com.intellij.util.ui.JBUI;
import org.intellij.lang.annotations.MagicConstant;
import org.jetbrains.annotations.NotNull;
@@ -37,9 +37,9 @@ import java.awt.geom.Rectangle2D;
public class WinIntelliJSpinnerUI extends DarculaSpinnerUI {
static final String HOVER_PROPERTY = "JSpinner.hover";
static final int BUTTON_WIDTH = 20;
static final int SPINNER_HEIGHT = 22;
static final int EDITOR_OFFSET = 3;
static final int BUTTON_WIDTH = 21;
static final int SPINNER_HEIGHT = 24;
static final int EDITOR_OFFSET = 5;
private MouseListener editorMouseListener;
@@ -58,13 +58,18 @@ public class WinIntelliJSpinnerUI extends DarculaSpinnerUI {
editorMouseListener = new MouseAdapter() {
@Override public void mouseEntered(MouseEvent e) {
spinner.putClientProperty(HOVER_PROPERTY, Boolean.TRUE);
spinner.repaint();
setHover(Boolean.TRUE);
}
@Override public void mouseExited(MouseEvent e) {
spinner.putClientProperty(HOVER_PROPERTY, Boolean.FALSE);
spinner.repaint();
setHover(Boolean.FALSE);
}
private void setHover(Boolean value) {
if (spinner.isEnabled()) {
spinner.putClientProperty(HOVER_PROPERTY, value);
spinner.repaint();
}
}
};
spinner.addMouseListener(editorMouseListener);
@@ -88,10 +93,25 @@ public class WinIntelliJSpinnerUI extends DarculaSpinnerUI {
@Override public void paint(Graphics g, JComponent c) {
Graphics2D g2 = (Graphics2D)g.create();
try {
Component parent = c.getParent();
g2.setColor(c.isEnabled() ? UIManager.getColor("TextField.background") :
parent != null ? parent.getBackground() : UIManager.getColor("TextField.inactiveBackground"));
g2.fillRect(0, 0, c.getWidth(), c.getHeight());
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
g2.setRenderingHint(RenderingHints.KEY_STROKE_CONTROL, RenderingHints.VALUE_STROKE_NORMALIZE);
Rectangle r = new Rectangle(c.getWidth(), c.getHeight());
Container parent = c.getParent();
if (c.isOpaque() && parent != null) {
g2.setColor(parent.getBackground());
g2.fill(r);
}
JBInsets.removeFrom(r, JBUI.insets(2, 2, 2, BUTTON_WIDTH));
g2.setColor(c.isEnabled() ? c.getBackground() : UIManager.getColor("Button.background"));
if (!c.isEnabled()) {
g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.35f));
}
g2.fill(r);
} finally {
g2.dispose();
}
@@ -109,20 +129,20 @@ public class WinIntelliJSpinnerUI extends DarculaSpinnerUI {
// set clip
Area clip = new Area(g2.getClip());
if ((DarculaSpinnerBorder.isFocused(spinner) || spinner.getClientProperty(HOVER_PROPERTY) == Boolean.TRUE) &&
!bm.isPressed()){
if (!bm.isRollover() && !bm.isPressed()){
clip.subtract(new Area(new Rectangle2D.Double(0, 0, bw, getHeight())));
}
if (getDirection() == SwingConstants.NORTH && prevButton.getModel().isRollover()) {
clip.subtract(new Area(new Rectangle2D.Double(0, getHeight() - bw, getWidth(), bw)));
clip.subtract(new Area(new Rectangle(0, getHeight() - bw, getWidth() - bw, bw)));
} else if (getDirection() == SwingConstants.SOUTH && nextButton.getModel().isRollover()) {
clip.subtract(new Area(new Rectangle2D.Double(0, 0, getWidth(), bw)));
clip.subtract(new Area(new Rectangle(0, 0, getWidth() - bw, bw)));
}
g2.setClip(clip);
// paint background
Rectangle2D outerRect = new Rectangle2D.Double(0, 0, getWidth(), getHeight());
Rectangle outerRect = new Rectangle(0, getDirection() == SwingConstants.NORTH ? bw : 0,
getWidth() - bw, getHeight() - bw);
if (spinner.isEnabled()) {
if (bm.isPressed()) {
g2.setColor(UIManager.getColor("Button.intellij.native.pressedBackgroundColor"));
@@ -157,7 +177,10 @@ public class WinIntelliJSpinnerUI extends DarculaSpinnerUI {
Path2D border = new Path2D.Double(Path2D.WIND_EVEN_ODD);
border.append(outerRect, false);
border.append(new Rectangle2D.Double(bw, bw, getWidth() - bw*2, getHeight() - bw*2), false);
Rectangle innerRect = new Rectangle(outerRect);
JBInsets.removeFrom(innerRect, JBUI.insets(1));
border.append(innerRect, false);
g2.fill(border);
} finally {
@@ -166,7 +189,7 @@ public class WinIntelliJSpinnerUI extends DarculaSpinnerUI {
}
@Override public Dimension getPreferredSize() {
return new JBDimension(BUTTON_WIDTH, (getDirection() == SwingConstants.NORTH) ? 12 : 11);
return new JBDimension(BUTTON_WIDTH, (getDirection() == SwingConstants.NORTH) ? 13 : 12);
}
@Override public Dimension getMaximumSize() {
@@ -179,13 +202,14 @@ public class WinIntelliJSpinnerUI extends DarculaSpinnerUI {
};
button.setName(name);
button.setBorder(new EmptyBorder(1, 1, 1, 1));
button.setRolloverEnabled(true);
button.setOpaque(false);
if (direction == SwingConstants.NORTH) {
installNextButtonListeners(button);
button.setBorder(new EmptyBorder(2, 1, 1, 2));
} else {
installPreviousButtonListeners(button);
button.setBorder(new EmptyBorder(1, 1, 2, 2));
}
return button;
}
@@ -220,23 +244,37 @@ public class WinIntelliJSpinnerUI extends DarculaSpinnerUI {
Rectangle bounds = parent.getBounds();
Dimension nextButtonSize = nextButton.getPreferredSize();
Dimension prevButtonSize = prevButton.getPreferredSize();
nextButtonSize.height = bounds.height * nextButtonSize.height / (nextButtonSize.height + prevButtonSize.height - JBUI.scale(1));
nextButton.setBounds(bounds.width - nextButtonSize.width, 0,
nextButtonSize.width, nextButtonSize.height);
Dimension prevButtonSize = prevButton.getPreferredSize();
prevButton.setBounds(bounds.width - prevButtonSize.width, nextButtonSize.height - JBUI.scale(1),
prevButtonSize.width, bounds.height - nextButtonSize.height + JBUI.scale(1));
JComponent editor = spinner.getEditor();
if (editor != null) {
layoutEditor(editor);
layoutEditor(bounds, editor);
}
}
};
}
@Override
protected void layoutEditor(@NotNull JComponent editor) {
@Override protected JComponent createEditor() {
JComponent editor = super.createEditor();
editor.setBorder(JBUI.Borders.empty(1, 0));
editor.setOpaque(false);
return editor;
}
@Override protected void replaceEditor(JComponent oldEditor, JComponent newEditor) {
super.replaceEditor(oldEditor, newEditor);
newEditor.setBorder(JBUI.Borders.empty(1, 0));
newEditor.setOpaque(false);
}
private void layoutEditor(Rectangle pBounds, @NotNull JComponent editor) {
Rectangle bounds = editor.getBounds();
Insets i = spinner.getInsets();
@@ -244,7 +282,7 @@ public class WinIntelliJSpinnerUI extends DarculaSpinnerUI {
editor.setBounds(bounds.x + offset,
bounds.y,
bounds.width - offset,
JBUI.scale(SPINNER_HEIGHT) - (i.top + i.bottom));
pBounds.height - (i.top + i.bottom));
}
@Override
platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextBorder.java
+3 -3
View File
@@ -66,10 +66,10 @@ public class WinIntelliJTextBorder extends DarculaTextBorder {
JComponent jc = (JComponent)c;
if (c.hasFocus()) {
g2.setColor(UIManager.getColor("TextField.focusedBorderColor"));
} else if (jc.isEnabled() && jc.getClientProperty(HOVER_PROPERTY) == Boolean.TRUE) {
} else if (jc.getClientProperty(HOVER_PROPERTY) == Boolean.TRUE) {
g2.setColor(UIManager.getColor("TextField.hoverBorderColor"));
} else {
g2.setColor(UIManager.getColor("TextField.borderColor"));
} else{
g2.setColor(UIManager.getColor(jc.isEnabled() ? "TextField.borderColor" : "Button.intellij.native.borderColor"));
}
if (!jc.isEnabled()) {
platform/platform-impl/src/com/intellij/ide/ui/laf/intellij/WinIntelliJTextFieldUI.java
+5 -6
View File
@@ -62,7 +62,8 @@ public class WinIntelliJTextFieldUI extends DarculaTextFieldUI {
@Override
protected void paintBackground(Graphics g) {
JTextComponent c = getComponent();
if (UIUtil.getParentOfType(JComboBox.class, c) != null) return;
if (UIUtil.getParentOfType(JComboBox.class, c) != null ||
UIUtil.getParentOfType(JSpinner.class, c) != null) return;
Graphics2D g2 = (Graphics2D)g.create();
try {
@@ -88,15 +89,13 @@ public class WinIntelliJTextFieldUI extends DarculaTextFieldUI {
g2.setColor(c.isEnabled() ? c.getBackground() : UIManager.getColor("Button.background"));
if (!c.isEnabled()) {
g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.47f));
g2.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.35f));
}
Rectangle r = new Rectangle(c.getSize());
if (UIUtil.getParentOfType(JSpinner.class, c) == null) { // Fill whole rectangle in spinner
JBInsets.removeFrom(r, JBUI.insets(2));
JBInsets.removeFrom(r, JBUI.insets(2));
adjustInWrapperRect(r, c);
adjustInWrapperRect(r, c);
}
g2.fill(r);
}
platform/platform-impl/src/com/intellij/ide/ui/laf/intellijlaf_native.properties
+1
View File
@@ -144,6 +144,7 @@ PopupMenu.translucentBackground=e8e8e8
ToolTip.background=ffffcc
SpinnerUI=com.intellij.ide.ui.laf.intellij.WinIntelliJSpinnerUI
Spinner.background=ffffff
Spinner.border=com.intellij.ide.ui.laf.intellij.WinIntelliJSpinnerBorder
Spinner.editorAlignment=2