Added a function to get screen coordinates relating to cursor coords.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2698 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp
index f28ef6a871b64126be157772ad8f94c3a2df3a7e..6fc798d84ae55317f72192868cf905dee7f52e5c 100644 (file)
--- a/samples/richedit/wxllist.cpp
+++ b/samples/richedit/wxllist.cpp
@@ -2135,7 +2135,9 @@ wxLayoutList::GetCursorScreenPos(wxDC &dc)
   have changed.
 */
 void
   have changed.
 */
 void

-wxLayoutList::Layout(wxDC &dc, CoordType bottom, bool forceAll)
+wxLayoutList::Layout(wxDC &dc, CoordType bottom, bool forceAll,
+                     wxPoint *cpos = NULL,
+                     wxPoint *csize = NULL)

 {
    // first, make sure everything is calculated - this might not be
    // needed, optimise it later
 {
    // first, make sure everything is calculated - this might not be
    // needed, optimise it later


@@ -2150,7 +2152,8 @@ wxLayoutList::Layout(wxDC &dc, CoordType bottom, bool forceAll)
    {
       if(! wasDirty)
          ApplyStyle(line->GetStyleInfo(), dc);
    {
       if(! wasDirty)
          ApplyStyle(line->GetStyleInfo(), dc);

-      if(forceAll || line->IsDirty())
+      if(forceAll || line->IsDirty()
+         || (cpos && line->GetLineNumber() == cpos->y))

       {
          // The following Layout() calls will update our
          // m_CurrentStyleInfo if needed.
       {
          // The following Layout() calls will update our
          // m_CurrentStyleInfo if needed.


@@ -2158,9 +2161,12 @@ wxLayoutList::Layout(wxDC &dc, CoordType bottom, bool forceAll)
             line->Layout(dc, this,
                          (wxPoint *)&m_CursorScreenPos,
                          (wxPoint *)&m_CursorSize, m_CursorPos.x);
             line->Layout(dc, this,
                          (wxPoint *)&m_CursorScreenPos,
                          (wxPoint *)&m_CursorSize, m_CursorPos.x);

+         if(cpos && line->GetLineNumber() == cpos->y)
+            line->Layout(dc, this,
+                         cpos,
+                         csize, cpos->x);

          else
             line->Layout(dc, this);
          else
             line->Layout(dc, this);

-

          // little condition to speed up redrawing:
          if(bottom != -1 && line->GetPosition().y > bottom)
             break;
          // little condition to speed up redrawing:
          if(bottom != -1 && line->GetPosition().y > bottom)
             break;


@@ -2169,7 +2175,7 @@ wxLayoutList::Layout(wxDC &dc, CoordType bottom, bool forceAll)
       line->RecalculatePositions(1, this);
       line = line->GetNextLine();
    }
       line->RecalculatePositions(1, this);
       line = line->GetNextLine();
    }

-
+   

    // can only be 0 if we are on the first line and have no next line
    wxASSERT(m_CursorSize.x != 0 || (m_CursorLine &&
                                     m_CursorLine->GetNextLine() == NULL &&
    // can only be 0 if we are on the first line and have no next line
    wxASSERT(m_CursorSize.x != 0 || (m_CursorLine &&
                                     m_CursorLine->GetNextLine() == NULL &&


@@ -2177,6 +2183,14 @@ wxLayoutList::Layout(wxDC &dc, CoordType bottom, bool forceAll)
    AddCursorPosToUpdateRect();
 }
 
    AddCursorPosToUpdateRect();
 }
 

+wxPoint
+wxLayoutList::GetScreenPos(wxDC &dc, const wxPoint &cpos, wxPoint *csize = NULL)
+{
+   wxPoint pos = cpos;
+   Layout(dc, -1, false, &pos, csize);
+   return pos;
+}
+

 void
 wxLayoutList::Draw(wxDC &dc,
                    wxPoint const &offset,
 void
 wxLayoutList::Draw(wxDC &dc,
                    wxPoint const &offset,

diff --git a/samples/richedit/wxllist.h b/samples/richedit/wxllist.h
index 5bc7fbae19ba4a3ca72de5bdb195bf8761fcc7dd..5f7a9191a5d685720d0d0b344ba186f2d82ea9b3 100644 (file)
--- a/samples/richedit/wxllist.h
+++ b/samples/richedit/wxllist.h
@@ -932,9 +932,23 @@ public:
        @param dc the wxDC to draw on
        @param bottom optional y coordinate where to stop calculating
        @param forceAll force re-layout of all lines
        @param dc the wxDC to draw on
        @param bottom optional y coordinate where to stop calculating
        @param forceAll force re-layout of all lines

+       @param cpos Can hold a cursorposition, and will be overwritten
+       with the corresponding DC position.
+       @param csize Will hold the cursor size relating to cpos.

    */
    */

-   void Layout(wxDC &dc, CoordType bottom = -1, bool forceAll = false);
-
+   void Layout(wxDC &dc, CoordType bottom = -1, bool forceAll = false,
+               wxPoint *cpos = NULL,
+               wxPoint *csize = NULL);
+
+   /** Returns the screen coordinates relating to a given cursor
+       position and the size of the cursor at that position.
+       @param dc for which to calculate it
+       @param cpos Cursor position to look for.
+       @param csize If non-NULL, will be set to the cursor size.
+       @return The cursor position on the DC.
+   */
+   wxPoint GetScreenPos(wxDC &dc, const wxPoint &cpos, wxPoint *csize = NULL);
+   

    /** Calculates new sizes for everything in the list, like Layout()
        but this is needed after the list got changed.
        @param dc the wxDC to draw on
    /** Calculates new sizes for everything in the list, like Layout()
        but this is needed after the list got changed.
        @param dc the wxDC to draw on