Merge remote-tracking branch 'origin/master'

This commit is contained in:
Anna Kozlova
2014-07-23 19:21:39 +02:00
@@ -765,7 +765,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark
x = isMirrored() ? width + 2 : 0;
}
if (color == null) return;
Color darker = ColorUtil.shift(color, 0.75);
Color darker = UIUtil.isUnderDarcula()? color : ColorUtil.shift(color, 0.75);
if (flatStyle) {
g.setColor(darker);