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

fix blue color

Browse Source 
(cherry picked from commit 0fd70bedacb91e4451f42edefa1970f580b5549b)

Conflicts:

	platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/Advertiser.java
This commit is contained in:
Konstantin Bulenkov
2012-11-30 14:05:56 +01:00
parent 1fcb8f6685
commit 6845731e82
8 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
colorSchemes/src/colorSchemes/Darcula.xml
+10
View File
@@ -227,6 +227,16 @@
<option name="ERROR_STRIPE_COLOR" />
</value>
</option>
<option name="CTRL_CLICKABLE">
<value>
<option name="FOREGROUND" value="589df6" />
<option name="BACKGROUND" />
<option name="FONT_TYPE" value="0" />
<option name="EFFECT_COLOR" value="589df6"/>
<option name="EFFECT_TYPE" value="1" />
<option name="ERROR_STRIPE_COLOR" />
</value>
</option>
<option name="CSS.FUNCTION">
<value>
<option name="FOREGROUND" value="da4939" />
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/Advertiser.java
+4 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2011 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@ package com.intellij.codeInsight.lookup.impl;
import com.intellij.openapi.application.ApplicationManager;
import com.intellij.ui.ClickListener;
import com.intellij.ui.JBColor;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.ui.GridBag;
import com.intellij.util.ui.UIUtil;
@@ -70,7 +71,7 @@ public class Advertiser {
myNextLabel = new JLabel(">>");
myNextLabel.setFont(adFont().deriveFont(
ContainerUtil.<TextAttribute, Object>immutableMapBuilder().put(TextAttribute.UNDERLINE, TextAttribute.UNDERLINE_ON).build()));
myNextLabel.setForeground(Color.blue);
myNextLabel.setForeground(JBColor.blue);
new ClickListener() {
@Override
public boolean onClick(MouseEvent e, int clickCount) {
@@ -93,8 +94,7 @@ public class Advertiser {
if (!myTexts.isEmpty()) {
String text = myTexts.get(myCurrentItem % myTexts.size());
myTextPanel.setText(prepareText(text));
}
else {
} else {
myTextPanel.setText("");
}
myCachedPrefSize = null;
platform/lang-impl/src/com/intellij/codeInsight/navigation/CtrlMouseHandler.java
+2 -1
View File
@@ -70,6 +70,7 @@ import com.intellij.psi.impl.source.tree.injected.InjectedLanguageUtil;
import com.intellij.psi.search.searches.DefinitionsSearch;
import com.intellij.psi.util.PsiUtilCore;
import com.intellij.ui.HintListener;
import com.intellij.ui.JBColor;
import com.intellij.ui.LightweightHint;
import com.intellij.ui.ScreenUtil;
import com.intellij.usageView.UsageViewShortNameLocation;
@@ -217,7 +218,7 @@ public class CtrlMouseHandler extends AbstractProjectComponent {
private static final TextAttributesKey CTRL_CLICKABLE_ATTRIBUTES_KEY =
TextAttributesKey
.createTextAttributesKey("CTRL_CLICKABLE", new TextAttributes(Color.blue, null, Color.blue, EffectType.LINE_UNDERSCORE, 0));
.createTextAttributesKey("CTRL_CLICKABLE", new TextAttributes(JBColor.blue, null, JBColor.blue, EffectType.LINE_UNDERSCORE, 0));
@NotNull private final Alarm myDocAlarm;
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionTree.java
+3 -4
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.FileStatus;
import com.intellij.profile.codeInspection.ui.InspectionsConfigTreeComparator;
import com.intellij.ui.ColoredTreeCellRenderer;
import com.intellij.ui.JBColor;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.ui.TreeSpeedSearch;
import com.intellij.ui.treeStructure.Tree;
@@ -53,9 +54,7 @@ import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.ExpandVetoException;
import javax.swing.tree.TreeNode;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.util.*;
import java.util.List;
public class InspectionTree extends Tree {
private final HashSet<Object> myExpandedUserObjects;
@@ -280,7 +279,7 @@ public class InspectionTree extends Tree {
if (refElement instanceof RefElement) {
refElement = ((RefElement)refElement).getContainingEntry();
if (((RefElement)refElement).isEntry() && ((RefElement)refElement).isPermanentEntry()) {
foreground = new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, Color.blue);
foreground = new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, JBColor.blue);
}
}
platform/platform-api/src/com/intellij/openapi/ui/MessageType.java
+3 -3
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2009 JetBrains s.r.o.
* Copyright 2000-2012 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,9 +25,9 @@ import java.awt.*;
public class MessageType {
public static final MessageType ERROR = new MessageType(UIUtil.getBalloonErrorIcon(),
new JBColor(new Color(255, 204, 204, 230), new Color(0x70202c)));
new JBColor(new Color(255, 204, 204, 230), new Color(0x70383a)));
public static final MessageType INFO = new MessageType(UIUtil.getBalloonInformationIcon(),
new JBColor(new Color(186, 238, 186, 230), new Color(0x19451a)));
new JBColor(new Color(186, 238, 186, 230), new Color(0x356936)));
public static final MessageType WARNING = new MessageType(UIUtil.getBalloonWarningIcon(),
new JBColor(new Color(249, 247, 142, 230), new Color(0x5C5C42)));
platform/platform-impl/src/com/intellij/codeInsight/hint/HintManagerImpl.java
+1 -1
View File
@@ -790,7 +790,7 @@ public class HintManagerImpl extends HintManager implements Disposable {
hintInfo.initStyleFrom(hint.getComponent());
if (showByBalloon) {
hintInfo.setBorderColor(UIUtil.isUnderDarcula() ? Gray._180 : Color.gray);
hintInfo.setBorderColor(new JBColor(Color.gray, Gray._140));
hintInfo.setFont(hintInfo.getTextFont().deriveFont(Font.PLAIN));
hintInfo.setCalloutShift((int)(editor.getLineHeight() * 0.1));
}
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorGutterComponentImpl.java
+3 -2
View File
@@ -47,6 +47,7 @@ import com.intellij.openapi.util.Comparing;
import com.intellij.openapi.util.Ref;
import com.intellij.openapi.util.SystemInfo;
import com.intellij.ui.HintHint;
import com.intellij.ui.JBColor;
import com.intellij.ui.awt.RelativePoint;
import com.intellij.util.Function;
import com.intellij.util.IconUtil;
@@ -251,7 +252,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
paintBackground(g, clip, getAnnotationsAreaOffset(), w);
Color color = myEditor.getColorsScheme().getColor(EditorColors.ANNOTATIONS_COLOR);
g.setColor(color != null ? color : Color.blue);
g.setColor(color != null ? color : JBColor.blue);
g.setFont(myEditor.getColorsScheme().getFont(EditorFontType.PLAIN));
for (int i = 0; i < myTextAnnotationGutters.size(); i++) {
@@ -362,7 +363,7 @@ class EditorGutterComponentImpl extends EditorGutterComponentEx implements Mouse
}
Color color = myEditor.getColorsScheme().getColor(EditorColors.LINE_NUMBERS_COLOR);
g.setColor(color != null ? color : Color.blue);
g.setColor(color != null ? color : JBColor.blue);
g.setFont(myEditor.getColorsScheme().getFont(EditorFontType.PLAIN));
Graphics2D g2 = (Graphics2D)g;
platform/platform-impl/src/com/intellij/openapi/options/newEditor/OptionsTree.java
+2 -2
View File
@@ -370,10 +370,10 @@ public class OptionsTree extends JPanel implements Disposable, OptionsEditorColl
if (base.isError()) {
fg = UIUtil.isUnderDarcula() ? DarculaColors.RED : Color.red;
fg = JBColor.red;
}
else if (base.isModified()) {
fg = UIUtil.isUnderDarcula() ? DarculaColors.BLUE : Color.blue;
fg = JBColor.blue;
}
}