• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28304 (tree)
Time2018-07-21 15:15:15
Authorstefankueng

Log Message

Fix dragging the slider in TortoiseIDiff when only two images are shown.

Change Summary

Incremental Difference

--- trunk/src/TortoiseIDiff/MainWindow.cpp (revision 28303)
+++ trunk/src/TortoiseIDiff/MainWindow.cpp (revision 28304)
@@ -927,32 +927,46 @@
927927 #define MINWINSIZE 10
928928 if (bVertical)
929929 {
930- if (bDrag2)
930+ if (selectionPaths.size() != 3)
931931 {
932- if (pt.y < (nSplitterPos+MINWINSIZE))
933- pt.y = nSplitterPos+MINWINSIZE;
934- nSplitterPos2 = pt.y;
932+ nSplitterPos = pt.y;
935933 }
936934 else
937935 {
938- if (pt.y > (nSplitterPos2-MINWINSIZE))
939- pt.y = nSplitterPos2-MINWINSIZE;
940- nSplitterPos = pt.y;
936+ if (bDrag2)
937+ {
938+ if (pt.y < (nSplitterPos+MINWINSIZE))
939+ pt.y = nSplitterPos+MINWINSIZE;
940+ nSplitterPos2 = pt.y;
941+ }
942+ else
943+ {
944+ if (pt.y > (nSplitterPos2-MINWINSIZE))
945+ pt.y = nSplitterPos2-MINWINSIZE;
946+ nSplitterPos = pt.y;
947+ }
941948 }
942949 }
943950 else
944951 {
945- if (bDrag2)
952+ if (selectionPaths.size() != 3)
946953 {
947- if (pt.x < (nSplitterPos+MINWINSIZE))
948- pt.x = nSplitterPos+MINWINSIZE;
949- nSplitterPos2 = pt.x;
954+ nSplitterPos = pt.x;
950955 }
951956 else
952957 {
953- if (pt.x > (nSplitterPos2-MINWINSIZE))
954- pt.x = nSplitterPos2-MINWINSIZE;
955- nSplitterPos = pt.x;
958+ if (bDrag2)
959+ {
960+ if (pt.x < (nSplitterPos+MINWINSIZE))
961+ pt.x = nSplitterPos+MINWINSIZE;
962+ nSplitterPos2 = pt.x;
963+ }
964+ else
965+ {
966+ if (pt.x > (nSplitterPos2-MINWINSIZE))
967+ pt.x = nSplitterPos2-MINWINSIZE;
968+ nSplitterPos = pt.x;
969+ }
956970 }
957971 }
958972
Show on old repository browser