[gitg] Fix lines renderer ranges



commit 0734a48c3529577e2214af3bebda52284ed06004
Author: Ignacio Casal Quinteiro <icq gnome org>
Date:   Sat Dec 19 13:13:47 2015 +0100

    Fix lines renderer ranges

 libgitg/gitg-diff-view-file.vala           |    8 +++++---
 libgitg/gitg-diff-view-lines-renderer.vala |    2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/libgitg/gitg-diff-view-file.vala b/libgitg/gitg-diff-view-file.vala
index 02586f4..5476bf5 100644
--- a/libgitg/gitg-diff-view-file.vala
+++ b/libgitg/gitg-diff-view-file.vala
@@ -545,11 +545,13 @@ class Gitg.DiffViewFile : Gtk.Grid
                        content.append(text);
                }
 
+               int line_hunk_start = iter.get_line();
+
                buffer.insert(ref iter, (string)content.data, -1);
 
-               d_old_lines.add_hunk(line_header, iter.get_line(), hunk, lines);
-               d_new_lines.add_hunk(line_header, iter.get_line(), hunk, lines);
-               d_sym_lines.add_hunk(line_header, iter.get_line(), hunk, lines);
+               d_old_lines.add_hunk(line_hunk_start, iter.get_line(), hunk, lines);
+               d_new_lines.add_hunk(line_hunk_start, iter.get_line(), hunk, lines);
+               d_sym_lines.add_hunk(line_hunk_start, iter.get_line(), hunk, lines);
 
                for (var i = 0; i < lines.size; i++)
                {
diff --git a/libgitg/gitg-diff-view-lines-renderer.vala b/libgitg/gitg-diff-view-lines-renderer.vala
index 04308c6..fcec858 100644
--- a/libgitg/gitg-diff-view-lines-renderer.vala
+++ b/libgitg/gitg-diff-view-lines-renderer.vala
@@ -94,7 +94,7 @@ class Gitg.DiffViewLinesRenderer : Gtk.SourceGutterRendererText
                        }
                }
 
-               if (info == null || line >= info.line_infos.length)
+               if (info == null || (line - info.start) >= info.line_infos.length)
                {
                        set_text("", -1);
                }


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]