ui: reworked code view highlighting

This change draws the annotations in the code view in the paintEvent handler instead of using the ExtraSelections API.
Annotations are now drawn with a slight corner radius. Fill and border colors are defined in the ColorScheme.
This commit is contained in:
Eberhard Graether
2015-11-11 15:02:23 +01:00
parent 3351e4aad7
commit 42aa99d99b
9 changed files with 345 additions and 147 deletions
+40 -10
View File
@@ -62,7 +62,7 @@
</file>
<snippet>
<background>transparent</background>
<background>white</background>
<title>
<text>#A0A0A0</text>
@@ -72,7 +72,7 @@
<line_number>
<text>black</text>
<background>transparent</background>
<background>white</background>
</line_number>
<syntax>
@@ -86,20 +86,50 @@
<function>#CC9533</function>
</syntax>
<highlight>
<selection>
<location>
<normal>#90EBEBEB</normal>
<hover>#90B6D1DD</hover>
<normal>
<border>transparent</border>
<fill>transparent</fill>
</normal>
<focus>
<border>#B2B2B2</border>
<fill>transparent</fill>
</focus>
<active>
<border>#B2B2B2</border>
<fill>#EDEDED</fill>
</active>
</location>
<scope>
<normal>#60E4EEF2</normal>
<hover>#90E4EEF2</hover>
<normal>
<border>transparent</border>
<fill>transparent</fill>
</normal>
<focus>
<border>transparent</border>
<fill>transparent</fill>
</focus>
<active>
<border>transparent</border>
<fill>transparent</fill>
</active>
</scope>
<error>
<normal>#80FF0000</normal>
<hover>#FFFF0000</hover>
<normal>
<border>transparent</border>
<fill>#80FF0000</fill>
</normal>
<focus>
<border>transparent</border>
<fill>#FFFF0000</fill>
</focus>
<active>
<border>transparent</border>
<fill>#FFFF0000</fill>
</active>
</error>
</highlight>
</selection>
</snippet>
</code>
+40 -10
View File
@@ -62,7 +62,7 @@
</file>
<snippet>
<background>transparent</background>
<background>#272728</background>
<title>
<text>#A0A0A0</text>
@@ -72,7 +72,7 @@
<line_number>
<text>#F7F7F7</text>
<background>transparent</background>
<background>#272728</background>
</line_number>
<syntax>
@@ -86,20 +86,50 @@
<function>#D69C36</function>
</syntax>
<highlight>
<selection>
<location>
<normal>#20EBEBEB</normal>
<hover>#40B6D1DD</hover>
<normal>
<border>transparent</border>
<fill>transparent</fill>
</normal>
<focus>
<border>#B2B2B2</border>
<fill>transparent</fill>
</focus>
<active>
<border>#B2B2B2</border>
<fill>#4A4A4A</fill>
</active>
</location>
<scope>
<normal>#10E4EEF2</normal>
<hover>#18E4EEF2</hover>
<normal>
<border>transparent</border>
<fill>transparent</fill>
</normal>
<focus>
<border>transparent</border>
<fill>transparent</fill>
</focus>
<active>
<border>transparent</border>
<fill>transparent</fill>
</active>
</scope>
<error>
<normal>#A0FF0000</normal>
<hover>#FFFF0000</hover>
<normal>
<border>transparent</border>
<fill>#A0FF0000</fill>
</normal>
<focus>
<border>transparent</border>
<fill>#FFFF0000</fill>
</focus>
<active>
<border>transparent</border>
<fill>#FFFF0000</fill>
</active>
</error>
</highlight>
</selection>
</snippet>
</code>