From 42e704aad84c92c3f4db9ce1747ae9c3825aa870 Mon Sep 17 00:00:00 2001
From: Kai Willadsen <kai.willadsen@gmail.com>
Date: Sun, 29 Jul 2018 07:42:29 +1000
Subject: [PATCH] sourceview: Simplify current line highlighting with an alpha
 style

---
 data/styles/meld-base.xml | 2 +-
 data/styles/meld-dark.xml | 2 +-
 meld/sourceview.py        | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/data/styles/meld-base.xml b/data/styles/meld-base.xml
index 8b8b58b8d..dd82425f8 100644
--- a/data/styles/meld-base.xml
+++ b/data/styles/meld-base.xml
@@ -9,7 +9,7 @@
   <style name="meld:delete" background="#ffffff" foreground="#880000" line-background="#cccccc"/>
   <style name="meld:error" background="#fce94f" foreground="#faad3d" line-background="#fade0a"/>
   <style name="meld:inline" background="#8ac2ff"/>
-  <style name="meld:current-line-highlight" foreground="#333333" background="#ffff00"/>
+  <style name="meld:current-line-highlight" foreground="#333333" background="#rgba(255, 255, 0, 0.25)"/>
   <style name="meld:unknown-text" foreground="#888888"/>
   <style name="meld:syncpoint-outline" foreground="#555555"/>
   <style name="meld:current-chunk-highlight" background="#rgba(255, 255, 255, 0.5)"/>
diff --git a/data/styles/meld-dark.xml b/data/styles/meld-dark.xml
index 5f35b00ee..6188bf226 100644
--- a/data/styles/meld-dark.xml
+++ b/data/styles/meld-dark.xml
@@ -10,7 +10,7 @@
   <style name="meld:delete" background="#ffffff" foreground="#a40000" line-background="#cccccc"/>
   <style name="meld:error" background="#fce94f" foreground="#faad3d" line-background="#fdf8cd"/>
   <style name="meld:inline" background="#24527e"/>
-  <style name="meld:current-line-highlight" foreground="#eeeeee" background="#111100"/>
+  <style name="meld:current-line-highlight" foreground="#eeeeee" background="#rgba(17, 17, 0, 0.25)"/>
   <style name="meld:unknown-text" foreground="#aaaaaa"/>
   <style name="meld:syncpoint-outline" foreground="#bbbbbb"/>
   <style name="meld:current-chunk-highlight" background="#rgba(255, 255, 255, 0.06)"/>
diff --git a/meld/sourceview.py b/meld/sourceview.py
index 9057ae9c3..41d889088 100644
--- a/meld/sourceview.py
+++ b/meld/sourceview.py
@@ -272,12 +272,9 @@ def do_draw_layer(self, layer, context):
         if self.props.highlight_current_line_local and self.is_focus():
             it = textbuffer.get_iter_at_mark(textbuffer.get_insert())
             ypos, line_height = self.get_line_yrange(it)
-            context.save()
             context.rectangle(x, ypos, width, line_height)
-            context.clip()
             context.set_source_rgba(*self.highlight_color)
-            context.paint_with_alpha(0.25)
-            context.restore()
+            context.fill()
 
         # Draw syncpoint indicator lines
         for syncpoint in self.syncpoints: