[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Corrupted view in TortoiseMerge

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-12-05 20:25:32 CET

Alexander Makeev wrote:
> As I have been wrote to user-list:
>> In TortoiseMerge when I diff files long lines are truncated in some
>> distance from right window border. Endings of short lines expanded with symbols
>> from other lines. Line selection actually selects strange part of
>> window. Scroll to the right doesn't show line endings, left scroll is ok.
>> Screenshot of this problems: http://exmsoft.com/other/mergeview.png.
> Exploring source code I found that in CBaseView all chars have to be
> one width (width of "x" char). I change it to "i"(thin
> letter)(CBaseView::CalcLineCharDim()), old problem is gone but now I
> have problem with scroll bars range. I just cann't scroll till the end
> of line. I revert "i" to "x" back, and change line trimming option
> during output in CBaseView::DrawSingleLine
> from VERIFY(pDC->ExtTextOut(origin.x, origin.y, ETO_CLIPPED, &rc, line, nCount, NULL));
> to VERIFY(pDC->ExtTextOut(origin.x, origin.y, ETO_CLIPPED, &rc, line, line.GetLength(), NULL));
> ^^^^^^^^^^^^^^^

That won't work correctly. nCount is calculated as
nCount = line.GetLength() - line2.GetLength();
So you can't just use the length of line and ignore the length of line2.

> May be it less optimized but it works fine for me. But I still
> wondering why nobody else has this problem :) and want to understand
> why I get it. I haven't any monospaced font in settings dialog.
> May be I have wrong understanding of source code. I started to explore it
> one hour ago :)

You have no monospaced font on your system??? Honestly, I can't really
believe that. And the settings dialog of TMerge only shows you
monospaced fonts to choose from. If not, then there's a bug in the font
selection dialog.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Dec 5 20:27:22 2005

This is an archived mail posted to the TortoiseSVN Dev mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.