| Revision | 28112 (tree) |
|---|---|
| Zeit | 2018-02-20 04:30:58 |
| Autor | stefankueng |
* correctly set the max line length if there is only one line
* recalculate the horizontal scrollbar when wrapping changes
trunk/src/Changelog.txt (diff)
trunk/src/TortoiseMerge/BaseView.cpp (diff) trunk/test/mergediff/longline1.txt (diff) trunk/test/mergediff/longline2.txt (diff)| @@ -10,6 +10,8 @@ | ||
| 10 | 10 | contain the "%" char. (Stefan) |
| 11 | 11 | - BUG: TMerge did not select the whole line when clicked |
| 12 | 12 | on the line number. (Stefan) |
| 13 | +- BUG: Horizontal scrollbar shown wrong if the view | |
| 14 | + in TMerge had only one line. (Stefan) | |
| 13 | 15 | |
| 14 | 16 | Version 1.9.7 |
| 15 | 17 | - BUG: Drag copy-and-add did not add auto-properties. (Stefan) |
| @@ -593,7 +593,10 @@ | ||
| 593 | 593 | m_nMaxLineLength = 0; |
| 594 | 594 | int nLineCount = GetLineCount(); |
| 595 | 595 | if (nLineCount == 1) |
| 596 | - return GetLineLengthWithTabsConverted(0); | |
| 596 | + { | |
| 597 | + m_nMaxLineLength = GetLineLengthWithTabsConverted(0); | |
| 598 | + return m_nMaxLineLength; | |
| 599 | + } | |
| 597 | 600 | for (int i=0; i<nLineCount; i++) |
| 598 | 601 | { |
| 599 | 602 | int nActualLength = GetLineLengthWithTabsConverted(i); |
| @@ -5399,6 +5402,7 @@ | ||
| 5399 | 5402 | { |
| 5400 | 5403 | m_nMaxLineLength = -1; |
| 5401 | 5404 | m_nOffsetChar = 0; |
| 5405 | + RecalcHorzScrollBar(); | |
| 5402 | 5406 | } |
| 5403 | 5407 | |
| 5404 | 5408 | void CBaseView::OnEditFind() |
| @@ -0,0 +1 @@ | ||
| 1 | +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbccccccccccccccccccccccccccccccddddddddddddddddddddddddddddddddeeeeeeeeeeeeeeeeeeeeeeeeffffffffffffffffffffffffffffffgggggggggggggggggggggggggggghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh | |
| \ No newline at end of file |
| @@ -0,0 +1 @@ | ||
| 1 | +aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbccccccccccccccccccccccccccccccddddddddddddddddddddddddddddddddeeeeeeeeeeeeeeeeeeeeeeeeffffffffffffffffffffffffffffffgggggggggggggggggggggggggggghhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhhxxx | |
| \ No newline at end of file |
TortoiseSVN