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

remove static fields

Browse Source 
(cherry picked from commit dacab28540d076f2999868a7e3276fe8951d3a4b)
This commit is contained in:
Konstantin Bulenkov
2012-11-30 14:09:56 +01:00
parent a3b239dcf2
commit f0a8dabc5a
5 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/ide/util/treeView/smartTree/GroupWrapper.java
+1
View File
@@ -17,6 +17,7 @@
package com.intellij.ide.util.treeView.smartTree;
import com.intellij.ide.projectView.PresentationData;
import com.intellij.navigation.ItemPresentation;
import com.intellij.openapi.project.Project;
import java.util.Collection;
platform/platform-api/src/com/intellij/ui/components/JBScrollPane.java
+2 -2
View File
@@ -139,10 +139,10 @@ public class JBScrollPane extends JScrollPane {
@Override
protected void paintComponent(Graphics g) {
g.setColor(ButtonlessScrollBarUI.TRACK_BACKGROUND);
g.setColor(ButtonlessScrollBarUI.getTrackBackground());
g.fillRect(0, 0, getWidth(), getHeight());
g.setColor(ButtonlessScrollBarUI.TRACK_BORDER);
g.setColor(ButtonlessScrollBarUI.getTrackBorderColor());
int x2 = getWidth() - 1;
int y2 = getHeight() - 1;
platform/platform-api/src/com/intellij/util/ui/ButtonlessScrollBarUI.java
+25 -10
View File
@@ -30,11 +30,26 @@ import java.awt.event.*;
* @author Konstantin Bulenkov
*/
public class ButtonlessScrollBarUI extends BasicScrollBarUI {
public static final Color GRADIENT_LIGHT = new JBColor(Gray._251, Gray._122);
public static final Color GRADIENT_DARK = new JBColor(Gray._215, Gray._105);
public static final Color GRADIENT_THUMB_BORDER = new JBColor(Gray._201, Gray._98);
public static final Color TRACK_BACKGROUND = new JBColor(LightColors.SLIGHTLY_GRAY, UIUtil.getControlColor());
public static final Color TRACK_BORDER = new JBColor(Gray._230, UIUtil.getControlColor());
public static JBColor getGradientLightColor() {
return new JBColor(Gray._251, Gray._122);
}
public static JBColor getGradientDarkColor() {
return new JBColor(Gray._215, Gray._105);
}
private static JBColor getGradientThumbBorderColor() {
return new JBColor(Gray._201, Gray._98);
}
public static JBColor getTrackBackground() {
return new JBColor(LightColors.SLIGHTLY_GRAY, UIUtil.getControlColor());
}
public static JBColor getTrackBorderColor() {
return new JBColor(Gray._230, UIUtil.getControlColor());
}
private static final BasicStroke BORDER_STROKE = new BasicStroke();
public static final int ANIMATION_COLOR_SHIFT = 40;
@@ -182,10 +197,10 @@ public class ButtonlessScrollBarUI extends BasicScrollBarUI {
@Override
protected void paintTrack(Graphics g, JComponent c, Rectangle bounds) {
g.setColor(TRACK_BACKGROUND);
g.setColor(getTrackBackground());
g.fillRect(bounds.x, bounds.y, bounds.width, bounds.height);
g.setColor(TRACK_BORDER);
g.setColor(getTrackBorderColor());
if (isVertical()) {
g.drawLine(bounds.x, bounds.y, bounds.x, bounds.y + bounds.height);
}
@@ -248,8 +263,8 @@ public class ButtonlessScrollBarUI extends BasicScrollBarUI {
}
final GradientPaint paint;
final Color start = adjustColor(GRADIENT_LIGHT);
final Color end = adjustColor(GRADIENT_DARK);
final Color start = adjustColor(getGradientLightColor());
final Color end = adjustColor(getGradientDarkColor());
if (vertical) {
paint = new GradientPaint(1, 0, start, w + 1, 0, end);
@@ -263,7 +278,7 @@ public class ButtonlessScrollBarUI extends BasicScrollBarUI {
final Stroke stroke = g.getStroke();
g.setStroke(BORDER_STROKE);
g.setColor(GRADIENT_THUMB_BORDER);
g.setColor(getGradientThumbBorderColor());
g.drawRoundRect(hGap, vGap, w, h, 3, 3);
g.setStroke(stroke);
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorImpl.java
+2 -2
View File
@@ -6408,7 +6408,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
int width = bounds.width;
int height = bounds.height;
g.setColor(ButtonlessScrollBarUI.TRACK_BACKGROUND);
g.setColor(ButtonlessScrollBarUI.getTrackBackground());
g.fillRect(0, 0, width, height);
int shortner = 0;
@@ -6419,7 +6419,7 @@ public final class EditorImpl extends UserDataHolderBase implements EditorEx, Hi
g.setColor(myGutterComponent.getBackground());
g.fillRect(0, 0, width - shortner, height);
g.setColor(ButtonlessScrollBarUI.TRACK_BORDER);
g.setColor(ButtonlessScrollBarUI.getTrackBorderColor());
g.drawLine(width - 1 - shortner, 0, width - 1 - shortner, height);
g.drawLine(0, 0, width - 1, 0);
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
+4 -4
View File
@@ -348,10 +348,10 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
final Rectangle bounds = getBounds();
g.setColor(ButtonlessScrollBarUI.TRACK_BACKGROUND);
g.setColor(ButtonlessScrollBarUI.getTrackBackground());
g.fillRect(0, 0, bounds.width, bounds.height);
g.setColor(ButtonlessScrollBarUI.TRACK_BORDER);
g.setColor(ButtonlessScrollBarUI.getTrackBorderColor());
g.drawLine(0, 0, 0, bounds.height);
try {
@@ -452,10 +452,10 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
}
private void paintTrackBasement(Graphics g, Rectangle bounds) {
g.setColor(TRACK_BACKGROUND);
g.setColor(ButtonlessScrollBarUI.getTrackBackground());
g.fillRect(bounds.x, bounds.y, bounds.width, bounds.height + 1);
g.setColor(TRACK_BORDER);
g.setColor(ButtonlessScrollBarUI.getTrackBorderColor());
int border = isMirrored() ? bounds.x + bounds.width - 1 : bounds.x;
g.drawLine(border, bounds.y, border, bounds.y + bounds.height + 1);
}