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

Ignore background color from error/warning styles

Browse Source
This commit is contained in:
Alexander Lobas
2012-08-06 15:47:26 +04:00
parent 66bbd92007
commit 7d8424329b
2 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/designer/propertyTable/PropertyTable.java
+1 -1
View File
@@ -1166,7 +1166,7 @@ public abstract class PropertyTable extends JBTable {
int style = ((template.getStyle() & SimpleTextAttributes.STYLE_WAVED) != 0 ? SimpleTextAttributes.STYLE_WAVED : 0)
| ((template.getStyle() & SimpleTextAttributes.STYLE_UNDERLINE) != 0 ? SimpleTextAttributes.STYLE_UNDERLINE : 0);
attr = attr.derive(attr.getStyle() | style, template.getFgColor(), template.getBgColor(), template.getWaveColor());
attr = attr.derive(attr.getStyle() | style, template.getFgColor(), null, template.getWaveColor());
}
renderer.append(property.getName(), attr);
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/ComponentTree.java
+6 -16
View File
@@ -24,7 +24,6 @@ import com.intellij.designer.designSurface.EditableArea;
import com.intellij.designer.designSurface.FeedbackTreeLayer;
import com.intellij.designer.model.ErrorInfo;
import com.intellij.designer.model.RadComponent;
import com.intellij.lang.annotation.HighlightSeverity;
import com.intellij.openapi.actionSystem.DataProvider;
import com.intellij.openapi.actionSystem.PlatformDataKeys;
import com.intellij.openapi.editor.colors.EditorColorsManager;
@@ -45,16 +44,12 @@ import javax.swing.tree.DefaultTreeModel;
import javax.swing.tree.TreePath;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @author Alexander Lobas
*/
public final class ComponentTree extends Tree implements DataProvider {
private final Map<HighlightSeverity, Map<SimpleTextAttributes, SimpleTextAttributes>> myAttributes =
new HashMap<HighlightSeverity, Map<SimpleTextAttributes, SimpleTextAttributes>>();
private final StartInplaceEditing myInplaceEditingAction;
private QuickFixManager myQuickFixManager;
private DesignerEditorPanel myDesigner;
@@ -184,19 +179,14 @@ public final class ComponentTree extends Tree implements DataProvider {
wrapper = new AttributeWrapper() {
@Override
public SimpleTextAttributes getAttribute(SimpleTextAttributes attributes) {
Map<SimpleTextAttributes, SimpleTextAttributes> attributesMap = myAttributes.get(level.getSeverity());
if (attributesMap == null) {
attributesMap = new HashMap<SimpleTextAttributes, SimpleTextAttributes>();
myAttributes.put(level.getSeverity(), attributesMap);
Color bgColor = textAttributes.getBackgroundColor();
try {
textAttributes.setBackgroundColor(null);
return SimpleTextAttributes.fromTextAttributes(TextAttributes.merge(attributes.toTextAttributes(), textAttributes));
}
SimpleTextAttributes result = attributesMap.get(attributes);
if (result == null) {
result = SimpleTextAttributes.fromTextAttributes(TextAttributes.merge(attributes.toTextAttributes(), textAttributes));
attributesMap.put(attributes, result);
finally {
textAttributes.setBackgroundColor(bgColor);
}
return result;
}
};
}