[PATCH] Minor fix for linkmap actions
- From: Piotr Piastucki <leech miranda gmail com>
- To: meld-list <meld-list gnome org>
- Subject: [PATCH] Minor fix for linkmap actions
- Date: Tue, 05 Apr 2011 22:06:19 +0200
Hi,
There seems to be a small issue in the editable state handling in new
linkmap module (see http://piastucki.bdl.pl/meld/linkmap_actions.png,
only the middle pane is editable) .
The attached patch fixes the issue.
Cheers,
Piotr
>From 5a68eb4797d4bfff9d5b764af1344cae0f0e2e0c Mon Sep 17 00:00:00 2001
From: Piotr Piastucki <the_leech users berlios de>
Date: Tue, 5 Apr 2011 21:50:59 +0200
Subject: [PATCH] Minor fix for editable state handling in linkmap
---
meld/linkmap.py | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meld/linkmap.py b/meld/linkmap.py
index d0f5c78..4418ef8 100644
--- a/meld/linkmap.py
+++ b/meld/linkmap.py
@@ -121,11 +121,11 @@ class LinkMap(gtk.DrawingArea):
left_act, right_act = None, None
if change_type == "delete":
left_act = MODE_REPLACE
- if self.mode == MODE_DELETE and left_editable:
+ if (self.mode == MODE_DELETE or not right_editable) and left_editable:
left_act = MODE_DELETE
elif change_type == "insert":
right_act = MODE_REPLACE
- if self.mode == MODE_DELETE and right_editable:
+ if (self.mode == MODE_DELETE or not left_editable) and right_editable:
right_act = MODE_DELETE
elif change_type == "replace":
if not left_editable:
--
1.7.1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]