[Winmerge-svn] SF.net SVN: winmerge: [5026] trunk/Src/editlib/ccrystaleditview.cpp

[<jt...@us...>]

Revision: 5026
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5026&view=rev
Author:   jtuc
Date:     2008-02-11 08:38:26 -0800 (Mon, 11 Feb 2008)

Log Message:
-----------
Cosmetic fix: CCrystalEditView::ShowDropIndicator() was at times unexpectedly hiding the caret.

Modified Paths:
--------------
    trunk/Src/editlib/ccrystaleditview.cpp

Modified: trunk/Src/editlib/ccrystaleditview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaleditview.cpp	2008-02-10 19:30:58 UTC (rev 5025)
+++ trunk/Src/editlib/ccrystaleditview.cpp	2008-02-11 16:38:26 UTC (rev 5026)
@@ -1201,9 +1201,11 @@
       ::CreateCaret (m_hWnd, (HBITMAP) 1, 2, GetLineHeight ());
     }
   m_ptDropPos = ClientToText (point);
-  if (m_ptDropPos.x >= m_nOffsetChar)
+  // NB: m_ptDropPos.x is index into char array, which is uncomparable to m_nOffsetChar.
+  CPoint ptCaretPos = TextToClient (m_ptDropPos);
+  if (ptCaretPos.x >= GetMarginWidth())
     {
-      SetCaretPos (TextToClient (m_ptDropPos));
+      SetCaretPos (ptCaretPos);
       ShowCaret ();
     }
   else


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