diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/ProgressStripe.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/ProgressStripe.java index 4df9041f866b..11edb00ebfbb 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/ProgressStripe.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/ProgressStripe.java @@ -109,7 +109,7 @@ public class ProgressStripe extends JBPanel { private void adjustFiller() { if (myFiller != null && myToolbar.getHeight() != 0) { - Dimension dimension = new Dimension(0, myToolbar.getHeight() - ProgressStripeIcon.getHeight() / 2); + Dimension dimension = new Dimension(0, myToolbar.getHeight()); myFiller.changeShape(dimension, dimension, dimension); } } diff --git a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/ProgressStripeIcon.java b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/ProgressStripeIcon.java index f6b9fa0114f2..bef1af4bbea9 100644 --- a/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/ProgressStripeIcon.java +++ b/platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/ProgressStripeIcon.java @@ -17,6 +17,7 @@ package com.intellij.vcs.log.ui.frame; import com.intellij.ide.ui.laf.IntelliJLaf; import com.intellij.openapi.ui.GraphicsConfig; +import com.intellij.ui.ColorUtil; import com.intellij.ui.Gray; import com.intellij.ui.JBColor; import com.intellij.util.containers.ContainerUtil; @@ -79,8 +80,8 @@ public abstract class ProgressStripeIcon implements Icon { } private static class StripeIcon extends ProgressStripeIcon { - private static final JBColor BG_COLOR = new JBColor(Gray._165, Gray._88); - private static final JBColor FG_COLOR = new JBColor(Gray._255, Gray._128); + private static final double ALPHA = 0.8; + private static final JBColor BG_COLOR = new JBColor(ColorUtil.withAlpha(Gray._165, ALPHA), ColorUtil.withAlpha(Gray._88, ALPHA)); private static final int WIDTH = 16; private StripeIcon(@NotNull JComponent component, int shift) { @@ -95,9 +96,6 @@ public abstract class ProgressStripeIcon implements Icon { @Override protected void paint(@NotNull Graphics2D g2, int x, int y, int shift) { g2.setColor(BG_COLOR); - g2.fillRect(x + shift, y, JBUI.scale(WIDTH), JBUI.scale(HEIGHT)); - - g2.setColor(FG_COLOR); Path2D.Double path = new Path2D.Double(); int height = JBUI.scale(HEIGHT); @@ -118,10 +116,11 @@ public abstract class ProgressStripeIcon implements Icon { // this icon is not used under darcula @SuppressWarnings("UseJBColor") private static class GradientIcon extends ProgressStripeIcon { + private static final double ALPHA = 0.5; private static final Color DARK_BLUE = new Color(0x4d9ff8); private static final Color DARK_GRAY = Gray._165; - private static final Color LIGHT_BLUE = new Color(0x90c2f8); - private static final Color LIGHT_GRAY = new Color(0xdbdbdb); + private static final Color LIGHT_BLUE = ColorUtil.withAlpha(DARK_BLUE, ALPHA); + private static final Color LIGHT_GRAY = ColorUtil.withAlpha(DARK_GRAY, ALPHA); private static final int GRADIENT = 128; private GradientIcon(@NotNull JComponent component, int shift) {