[Winmerge-svn] SF.net SVN: winmerge:[7531] branches/R2_14

[<ge...@us...>]

Revision: 7531
          http://winmerge.svn.sourceforge.net/winmerge/?rev=7531&view=rev
Author:   gerundt
Date:     2011-05-29 11:37:22 +0000 (Sun, 29 May 2011)

Log Message:
-----------
PATCH: [ 3306182 ] "+/-" from number block don't work

Modified Paths:
--------------
    branches/R2_14/Docs/Users/ChangeLog.txt
    branches/R2_14/Src/DirView.cpp
    branches/R2_14/Src/Merge.rc

Modified: branches/R2_14/Docs/Users/ChangeLog.txt
===================================================================
--- branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-29 11:36:51 UTC (rev 7530)
+++ branches/R2_14/Docs/Users/ChangeLog.txt	2011-05-29 11:37:22 UTC (rev 7531)
@@ -31,6 +31,7 @@
   Bugfix: Created new matching folder to wrong folder (#2890961)
   Bugfix: Strange scrolling effect in location pane (#2942869)
   Bugfix: Plugin error after interrupting folder compare (#2919475)
+  Bugfix: "+" and "-" from the number block don't work in the editor (#3306182)
   Translation updates:
   - Hungarian (#3164982)
 

Modified: branches/R2_14/Src/DirView.cpp
===================================================================
--- branches/R2_14/Src/DirView.cpp	2011-05-29 11:36:51 UTC (rev 7530)
+++ branches/R2_14/Src/DirView.cpp	2011-05-29 11:37:22 UTC (rev 7531)
@@ -2485,6 +2485,17 @@
 					return FALSE;
 				}
 			}
+			int sel = GetFocusedItem();
+			if (pMsg->wParam == VK_SUBTRACT)
+			{
+				CollapseSubdir(sel);
+				return TRUE;
+			}
+			if (pMsg->wParam == VK_ADD)
+			{
+				ExpandSubdir(sel);
+				return TRUE;
+			}
 		}
 		else
 		{

Modified: branches/R2_14/Src/Merge.rc
===================================================================
--- branches/R2_14/Src/Merge.rc	2011-05-29 11:36:51 UTC (rev 7530)
+++ branches/R2_14/Src/Merge.rc	2011-05-29 11:37:22 UTC (rev 7531)
@@ -649,9 +649,7 @@
     VK_RIGHT,       ID_L2R,                 VIRTKEY, ALT, NOINVERT
     VK_RIGHT,       ID_L2RNEXT,             VIRTKEY, CONTROL, ALT, NOINVERT
     VK_UP,          ID_PREVDIFF,            VIRTKEY, ALT, NOINVERT
-    VK_ADD,         ID_VIEW_EXPAND,         VIRTKEY,  NOINVERT
     VK_ADD,         ID_VIEW_ZOOMIN,         VIRTKEY, CONTROL, NOINVERT
-    VK_SUBTRACT,    ID_VIEW_COLLAPSE,       VIRTKEY, NOINVERT
     VK_SUBTRACT,    ID_VIEW_ZOOMOUT,        VIRTKEY, CONTROL, NOINVERT
     VK_MULTIPLY,    ID_VIEW_ZOOMNORMAL,     VIRTKEY, CONTROL, NOINVERT
 END


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.