[meld: 3/7] filediff: Whitespace fixes
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld: 3/7] filediff: Whitespace fixes
- Date: Sun, 3 Nov 2019 00:56:51 +0000 (UTC)
commit 99fc1dcf53c3ecd7833174a48bb36ab0ca170192
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sun Nov 3 08:09:00 2019 +1000
filediff: Whitespace fixes
meld/filediff.py | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/meld/filediff.py b/meld/filediff.py
index e4ef96b1..6006d754 100644
--- a/meld/filediff.py
+++ b/meld/filediff.py
@@ -605,7 +605,7 @@ class FileDiff(Gtk.VBox, MeldDoc):
# use_viewport: seek next and previous diffes based on where
# the user is currently scrolling at.
target = (self.cursor.next if direction == Gdk.ScrollDirection.DOWN
- else self.cursor.prev)
+ else self.cursor.prev)
if use_viewport:
@@ -619,8 +619,7 @@ class FileDiff(Gtk.VBox, MeldDoc):
if not chunk:
return
-
- halfscreen = text_area.y+text_area.height / 2
+ halfscreen = text_area.y + text_area.height / 2
halfline = self.textview[pane].get_line_at_y(
halfscreen).target_iter.get_line()
@@ -633,7 +632,6 @@ class FileDiff(Gtk.VBox, MeldDoc):
self.go_to_chunk(target, centered=centered)
-
@Template.Callback()
def action_previous_conflict(self, *args):
self.go_to_chunk(self.cursor.prev_conflict, self.cursor.pane)
@@ -2172,4 +2170,4 @@ class FileDiff(Gtk.VBox, MeldDoc):
for mgr in self.msgarea_mgr:
if mgr.get_msg_id() == FileDiff.MSG_SYNCPOINTS:
mgr.clear()
- self.refresh_comparison()
\ No newline at end of file
+ self.refresh_comparison()
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]