print overlap gone, mouse/cursor handling

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

diff --git a/samples/richedit/TODO b/samples/richedit/TODO
index bba3a368879e19a92d513a6c782bd42f880128fa..f9036040e907a865c16bc3907328419d692d5d8c 100644 (file)
--- a/samples/richedit/TODO
+++ b/samples/richedit/TODO
@@ -11,6 +11,7 @@ BUGS
 TODO
 =====================================================================
 
 TODO
 =====================================================================
 

+- use printsetup margins

 
 - merge RecalulateXXX and Layout() into one
 
 
 - merge RecalulateXXX and Layout() into one
 

diff --git a/samples/richedit/wxLayout.cpp b/samples/richedit/wxLayout.cpp
index c23c45580b9ff3c1f362c461f7ccb4c3707ab201..017193f6352429315e4768d5982e82a679dbd429 100644 (file)
--- a/samples/richedit/wxLayout.cpp
+++ b/samples/richedit/wxLayout.cpp
@@ -240,7 +240,7 @@ MyFrame::Clear(void)
 {
    wxColour colBg(0, 255, 255);
 
 {
    wxColour colBg(0, 255, 255);
 

-   m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false, wxGREEN, &colBg);
+   m_lwin->Clear(wxROMAN,16,wxNORMAL,wxNORMAL, false, wxRED, &colBg);

 }
 
 
 }
 
 


@@ -332,7 +332,7 @@ void MyFrame::OnCommand( wxCommandEvent &event )
    {
       wxString line;
       wxLayoutList *llist = m_lwin->GetLayoutList();
    {
       wxString line;
       wxLayoutList *llist = m_lwin->GetLayoutList();

-      for(int i = 1; i < 5000; i++)
+      for(int i = 1; i < 300; i++)

       {
          line.Printf("This is line number %d.", i);
          llist->Insert(line);
       {
          line.Printf("This is line number %d.", i);
          llist->Insert(line);

diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp
index 2fb2d0c8166c44d1404bcf0cd47a80912c90c069..37880ef13fa50ded40a4fcfd82d238359d135c5e 100644 (file)
--- a/samples/richedit/wxllist.cpp
+++ b/samples/richedit/wxllist.cpp
@@ -2345,17 +2345,19 @@ wxLayoutList::Draw(wxDC &dc,
    {
       // only draw if between top and bottom:
       if((top == -1 ||
    {
       // only draw if between top and bottom:
       if((top == -1 ||

-          line->GetPosition().y + line->GetHeight() >= top))
+          line->GetPosition().y + line->GetHeight() > top))

       {
 //         if(! style_set)
          {
             ApplyStyle(line->GetStyleInfo(), dc);
             style_set = true;
          }
       {
 //         if(! style_set)
          {
             ApplyStyle(line->GetStyleInfo(), dc);
             style_set = true;
          }

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

          line->Draw(dc, this, offset);
       }
          line->Draw(dc, this, offset);
       }

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

       line = line->GetNextLine();
    }
    InvalidateUpdateRect();
       line = line->GetNextLine();
    }
    InvalidateUpdateRect();


@@ -2372,7 +2374,9 @@ wxLayoutList::FindObjectScreen(wxDC &dc, wxPoint const pos,
                                bool *found)
 {
    // First, find the right line:
                                bool *found)
 {
    // First, find the right line:

-   wxLayoutLine *line = m_FirstLine;
+   wxLayoutLine
+      *line = m_FirstLine,
+      *lastline = m_FirstLine;

    wxPoint p;
 
    ApplyStyle(m_DefaultStyleInfo, dc);
    wxPoint p;
 
    ApplyStyle(m_DefaultStyleInfo, dc);


@@ -2381,16 +2385,7 @@ wxLayoutList::FindObjectScreen(wxDC &dc, wxPoint const pos,
       p = line->GetPosition();
       if(p.y <= pos.y && p.y+line->GetHeight() >= pos.y)
          break;
       p = line->GetPosition();
       if(p.y <= pos.y && p.y+line->GetHeight() >= pos.y)
          break;

-#if 0
-      // we need to run a layout here to get font sizes right :-(
-
-      // VZ: we can't call Layout() from here because it marks the line as
-      //     clean and it is not refreshed when it's called from wxLayoutList::
-      //     Layout() - if we really need to do this, we should introduce an
-      //     extra argument to Layout() to prevent the line from MarkClean()ing
-      //     itself here
-      line->Layout(dc, this);
-#endif
+      lastline = line;

       line = line->GetNextLine();
    }
 
       line = line->GetNextLine();
    }
 


@@ -2398,18 +2393,21 @@ wxLayoutList::FindObjectScreen(wxDC &dc, wxPoint const pos,
    {
       if ( found )
           *found = false;
    {
       if ( found )
           *found = false;

-
-      return NULL; // not found
+      // use the last line:
+      line = lastline;

    }
 
    if ( cursorPos )
        cursorPos->y = line->GetLineNumber();
 
    }
 
    if ( cursorPos )
        cursorPos->y = line->GetLineNumber();
 

+   bool foundinline = true;

    // Now, find the object in the line:
    wxLOiterator i = line->FindObjectScreen(dc, this,
                                            pos.x,
                                            cursorPos ? &cursorPos->x : NULL,
    // Now, find the object in the line:
    wxLOiterator i = line->FindObjectScreen(dc, this,
                                            pos.x,
                                            cursorPos ? &cursorPos->x : NULL,

-                                           found);
+                                           &foundinline);
+   if(found)
+      *found = *found && foundinline;

    return (i == NULLIT) ? NULL : *i;
 
 }
    return (i == NULLIT) ? NULL : *i;
 
 }


@@ -2929,6 +2927,9 @@ bool wxLayoutPrintout::OnPrintPage(int page)
       int top, bottom;
       top = (page - 1)*m_PrintoutHeight;
       bottom = top + m_PrintoutHeight;
       int top, bottom;
       top = (page - 1)*m_PrintoutHeight;
       bottom = top + m_PrintoutHeight;

+
+      WXLO_DEBUG(("OnPrintPage(%d) printing from %d to %d", page, top, 
+                  bottom));

       // SetDeviceOrigin() doesn't work here, so we need to manually
       // translate all coordinates.
       wxPoint translate(m_Offset.x,m_Offset.y-top);
       // SetDeviceOrigin() doesn't work here, so we need to manually
       // translate all coordinates.
       wxPoint translate(m_Offset.x,m_Offset.y-top);


@@ -2953,13 +2954,21 @@ void wxLayoutPrintout::GetPageInfo(int *minPage, int *maxPage, int *selPageFrom,
    float scale = ScaleDC(&psdc);
 
    psdc.GetSize(&m_PageWidth, &m_PageHeight);
    float scale = ScaleDC(&psdc);
 
    psdc.GetSize(&m_PageWidth, &m_PageHeight);

-   // This sets a left/top origin of 15% and 20%:
-   m_Offset = wxPoint((15*m_PageWidth)/100, m_PageHeight/20);
+
+   // This sets a left/top origin of 10% and 7%:
+   m_Offset = wxPoint((10*m_PageWidth)/100, (7*m_PageHeight)/100);

 
    // This is the length of the printable area.
 
    // This is the length of the printable area.

-   m_PrintoutHeight = m_PageHeight - (int) (m_PageHeight * 0.15);
+   m_PrintoutHeight = m_PageHeight - 2*m_Offset.y;

    m_PrintoutHeight = (int)( m_PrintoutHeight / scale); // we want to use the real paper height
    m_PrintoutHeight = (int)( m_PrintoutHeight / scale); // we want to use the real paper height

-
+#if 0
+   // We should really use the margin settings of wxWindows somehow.
+   m_Offset = wxPoint(0,0);
+   // This is the length of the printable area.
+   m_PrintoutHeight = m_PageHeight;
+   m_PrintoutHeight = (int)( m_PrintoutHeight / scale); // we want to use the real paper height
+#endif
+   

 
    m_NumOfPages = 1 +
       (int)( m_llist->GetSize().y / (float)(m_PrintoutHeight));
 
    m_NumOfPages = 1 +
       (int)( m_llist->GetSize().y / (float)(m_PrintoutHeight));

diff --git a/samples/richedit/wxlwindow.cpp b/samples/richedit/wxlwindow.cpp
index c2185c9858c71112e5f5400dd6e8b78a61c4fe18..8100eb69fe65f3e1465b9328501d5f2fc0563bbc 100644 (file)
--- a/samples/richedit/wxlwindow.cpp
+++ b/samples/richedit/wxlwindow.cpp
@@ -313,16 +313,16 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
       case WXLOWIN_MENU_LDOWN:
          {
              // always move cursor to mouse click:
       case WXLOWIN_MENU_LDOWN:
          {
              // always move cursor to mouse click:

-             if ( obj )
+//             if ( obj )

              {
                 // we have found the real position
                 m_llist->MoveCursorTo(cursorPos);
              }
              {
                 // we have found the real position
                 m_llist->MoveCursorTo(cursorPos);
              }

-             else
-             {
-                // click beyond the end of the text
-                m_llist->MoveCursorToEnd();
-             }
+//             else
+//             {
+//                // click beyond the end of the text
+//                m_llist->MoveCursorToEnd();
+//             }

 
              // clicking a mouse removes the selection
              if ( m_llist->HasSelection() )
 
              // clicking a mouse removes the selection
              if ( m_llist->HasSelection() )


@@ -385,7 +385,7 @@ wxLayoutWindow::OnMouse(int eventId, wxMouseEvent& event)
          m_llist->StartSelection();
          m_llist->MoveCursorWord(1, false);
          m_llist->EndSelection();
          m_llist->StartSelection();
          m_llist->MoveCursorWord(1, false);
          m_llist->EndSelection();

-
+         m_Selecting = false;

          DoPaint();     // TODO: we don't have to redraw everything!
          break;
    }
          DoPaint();     // TODO: we don't have to redraw everything!
          break;
    }