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

[vcs-log] move progress under toolbar, add alpha

Browse Source
This commit is contained in:
Julia Beliaeva
2016-06-28 18:29:02 +03:00
parent 95952acb59
commit 117542a0c9
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/ProgressStripe.java
+1 -1
View File
@@ -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);
}
}
platform/vcs-log/impl/src/com/intellij/vcs/log/ui/frame/ProgressStripeIcon.java
+6 -7
View File
@@ -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) {