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

highlight colors reverted

Browse Source
This commit is contained in:
Dmitry Batkovich
2014-08-12 16:14:33 +04:00
parent 68248573dd
commit 7a01205e53
7 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
colorSchemes/src/colorSchemes/Darcula.xml
+6 -6
View File
@@ -553,9 +553,9 @@
</option>
<option name="ERRORS_ATTRIBUTES">
<value>
<option name="EFFECT_COLOR" value="dc3737" />
<option name="EFFECT_COLOR" value="bc3f3c" />
<option name="EFFECT_TYPE" value="2" />
<option name="ERROR_STRIPE_COLOR" value="dc3737" />
<option name="ERROR_STRIPE_COLOR" value="bc3f3c" />
</value>
</option>
<option name="EXECUTIONPOINT_ATTRIBUTES">
@@ -578,9 +578,9 @@
</option>
<option name="GENERIC_SERVER_ERROR_OR_WARNING">
<value>
<option name="EFFECT_COLOR" value="fa8c00" />
<option name="EFFECT_COLOR" value="f49810" />
<option name="EFFECT_TYPE" value="1" />
<option name="ERROR_STRIPE_COLOR" value="fa8c00" />
<option name="ERROR_STRIPE_COLOR" value="f49810" />
</value>
</option>
<option name="GRADLE_CHANGE_CONFLICT">
@@ -1565,9 +1565,9 @@
</option>
<option name="WARNING_ATTRIBUTES">
<value>
<option name="BACKGROUND" value="ffd900" />
<option name="BACKGROUND" value="52503a" />
<option name="EFFECT_TYPE" value="2" />
<option name="ERROR_STRIPE_COLOR" value="ffd900" />
<option name="ERROR_STRIPE_COLOR" value="8c8c00" />
</value>
</option>
<option name="WRITE_IDENTIFIER_UNDER_CARET_ATTRIBUTES">
platform/analysis-api/src/com/intellij/codeHighlighting/HighlightDisplayLevel.java
+1 -1
View File
@@ -38,7 +38,7 @@ public class HighlightDisplayLevel {
createIconByMask(CodeInsightColors.GENERIC_SERVER_ERROR_OR_WARNING));
public static final HighlightDisplayLevel ERROR = new HighlightDisplayLevel(HighlightSeverity.ERROR, createIconByMask(CodeInsightColors.ERRORS_ATTRIBUTES));
public static final HighlightDisplayLevel WARNING = new HighlightDisplayLevel(HighlightSeverity.WARNING, createIconByMask(CodeInsightColors.WARNINGS_ATTRIBUTES));
public static final HighlightDisplayLevel DO_NOT_SHOW = new HighlightDisplayLevel(HighlightSeverity.INFORMATION, createIconByMask(new Color(110, 180, 65)));
public static final HighlightDisplayLevel DO_NOT_SHOW = new HighlightDisplayLevel(HighlightSeverity.INFORMATION, createIconByMask(new Color(30, 160, 0)));
/**
* use #WEAK_WARNING instead
*/
platform/icons/src/general/errorMask.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 273 B

platform/icons/src/general/errorMask@2x.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.0 KiB

platform/icons/src/general/errorMask_dark.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 147 B

platform/lang-impl/src/com/intellij/profile/codeInspection/ui/inspectionsTree/MultiScopeSeverityIcon.java
+1 -1
View File
@@ -62,7 +62,6 @@ public class MultiScopeSeverityIcon implements Icon {
final Collection<HighlightSeverity> values = myScopeToAverageSeverityMap.values();
int idx = 0;
((Graphics2D)g).setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 0.5f));
for (final HighlightSeverity severity : values) {
final Icon icon = HighlightDisplayLevel.find(severity).getIcon();
g.setColor(icon instanceof HighlightDisplayLevel.SingleColorIconWithMask ?
@@ -71,6 +70,7 @@ public class MultiScopeSeverityIcon implements Icon {
g.fillRect(x, j, partWidth, getIconHeight());
idx++;
}
g.drawImage(HighlightDisplayLevel.ImageHolder.ourErrorMaskImage, i, j, null);
}
@Override
platform/platform-resources/src/DefaultColorSchemesManager.xml
+6 -6
View File
@@ -239,9 +239,9 @@
<value>
<option name="FOREGROUND"/>
<option name="BACKGROUND"/>
<option name="EFFECT_COLOR" value="dc3737"/>
<option name="EFFECT_COLOR" value="ff0000"/>
<option name="EFFECT_TYPE" value="2"/>
<option name="ERROR_STRIPE_COLOR" value="dc3737" />
<option name="ERROR_STRIPE_COLOR" value="ff0000" />
</value>
</option>
<option name="BLINKING_HIGHLIGHTS_ATTRIBUTES">
@@ -281,19 +281,19 @@
<option name="WARNING_ATTRIBUTES">
<value>
<option name="FOREGROUND"/>
<option name="BACKGROUND" value="ffd900"/>
<option name="BACKGROUND" value="f6ebbc"/>
<option name="EFFECT_COLOR"/>
<option name="EFFECT_TYPE" value="1"/>
<option name="ERROR_STRIPE_COLOR" value="ffd900" />
<option name="ERROR_STRIPE_COLOR" value="ffff00" />
</value>
</option>
<option name="GENERIC_SERVER_ERROR_OR_WARNING">
<value>
<option name="FOREGROUND"/>
<option name="BACKGROUND"/>
<option name="EFFECT_COLOR" value="fa8c00"/>
<option name="EFFECT_COLOR" value="f49810"/>
<option name="EFFECT_TYPE" value="2"/>
<option name="ERROR_STRIPE_COLOR" value="fa8c00" />
<option name="ERROR_STRIPE_COLOR" value="f49810" />
</value>
</option>
<option name="DUPLICATE_FROM_SERVER">