much better looking selection of justified paragraphs

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

diff --git a/include/wx/html/htmlcell.h b/include/wx/html/htmlcell.h
index 4d476606f2ec90cb5c3f68895668bd26650724f5..c7f8a23a75a48f042f125701b6ee6a0ad5e14dc6 100644 (file)
--- a/include/wx/html/htmlcell.h
+++ b/include/wx/html/htmlcell.h
@@ -175,6 +175,10 @@ public:
     int GetHeight() const {return m_Height;}
     int GetDescent() const {return m_Descent;}
 
     int GetHeight() const {return m_Height;}
     int GetDescent() const {return m_Descent;}
 

+    // Formatting cells are not visible on the screen, they only alter
+    // renderer's state.
+    bool IsFormattingCell() const { return m_Width == 0 && m_Height == 0; }
+

     const wxString& GetId() const { return m_id; }
     void SetId(const wxString& id) { m_id = id; }
 
     const wxString& GetId() const { return m_id; }
     void SetId(const wxString& id) { m_id = id; }
 

diff --git a/src/html/htmlcell.cpp b/src/html/htmlcell.cpp
index 665db26ff2504aa094bdd955f9519e9f2fe86343..2562184a576fab0df06f6014ffbcbff26c2b0c9e 100644 (file)
--- a/src/html/htmlcell.cpp
+++ b/src/html/htmlcell.cpp
@@ -349,12 +349,15 @@ static void SwitchSelState(wxDC& dc, wxHtmlRenderingInfo& info,
         dc.SetBackgroundMode(wxSOLID);
         dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg));
         dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg));
         dc.SetBackgroundMode(wxSOLID);
         dc.SetTextForeground(info.GetStyle().GetSelectedTextColour(fg));
         dc.SetTextBackground(info.GetStyle().GetSelectedTextBgColour(bg));

+        dc.SetBackground(wxBrush(info.GetStyle().GetSelectedTextBgColour(bg),
+                                 wxSOLID));

     }
     else
     {
         dc.SetBackgroundMode(wxTRANSPARENT);
         dc.SetTextForeground(fg);
         dc.SetTextBackground(bg);
     }
     else
     {
         dc.SetBackgroundMode(wxTRANSPARENT);
         dc.SetTextForeground(fg);
         dc.SetTextBackground(bg);

+        dc.SetBackground(wxBrush(bg, wxSOLID));

     }
 }
 
     }
 }
 


@@ -367,6 +370,8 @@ void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
     dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height);
 #endif
 
     dc.DrawRectangle(x+m_PosX,y+m_PosY,m_Width,m_Height);
 #endif
 

+    bool drawSelectionAfterCell = false;
+    

     if ( info.GetState().GetSelectionState() == wxHTML_SEL_CHANGING )
     {
         // Selection changing, we must draw the word piecewise:
     if ( info.GetState().GetSelectionState() == wxHTML_SEL_CHANGING )
     {
         // Selection changing, we must draw the word piecewise:


@@ -414,22 +419,49 @@ void wxHtmlWordCell::Draw(wxDC& dc, int x, int y,
             txt = m_Word.Mid(part2);
             dc.DrawText(txt, ofs + x + m_PosX, y + m_PosY);
         }
             txt = m_Word.Mid(part2);
             dc.DrawText(txt, ofs + x + m_PosX, y + m_PosY);
         }

+        else
+            drawSelectionAfterCell = true;

     }
     else
     {
     }
     else
     {

+        wxHtmlSelectionState selstate = info.GetState().GetSelectionState();

         // Not changing selection state, draw the word in single mode:
         // Not changing selection state, draw the word in single mode:

-
-        if ( info.GetState().GetSelectionState() != wxHTML_SEL_OUT &&
+        if ( selstate != wxHTML_SEL_OUT &&

              dc.GetBackgroundMode() != wxSOLID )
         {
             SwitchSelState(dc, info, true);
         }
              dc.GetBackgroundMode() != wxSOLID )
         {
             SwitchSelState(dc, info, true);
         }

-        else if ( info.GetState().GetSelectionState() == wxHTML_SEL_OUT &&
+        else if ( selstate == wxHTML_SEL_OUT &&

                   dc.GetBackgroundMode() == wxSOLID )
         {
             SwitchSelState(dc, info, false);
         }
         dc.DrawText(m_Word, x + m_PosX, y + m_PosY);
                   dc.GetBackgroundMode() == wxSOLID )
         {
             SwitchSelState(dc, info, false);
         }
         dc.DrawText(m_Word, x + m_PosX, y + m_PosY);

+        drawSelectionAfterCell = (selstate != wxHTML_SEL_OUT);
+    }
+
+    // NB: If the text is justified then there is usually some free space
+    //     between adjacent cells and drawing the selection only onto cells
+    //     would result in ugly unselected spaces. The code below detects
+    //     this special case and renders the selection *outside* the sell,
+    //     too.
+    if ( m_Parent->GetAlignHor() == wxHTML_ALIGN_JUSTIFY &&
+         drawSelectionAfterCell )
+    {
+        wxHtmlCell *nextCell = m_Next;
+        while ( nextCell && nextCell->IsFormattingCell() )
+            nextCell = nextCell->GetNext();
+        if ( nextCell )
+        {
+            int nextX = nextCell->GetPosX();
+            if ( m_PosX + m_Width < nextX )
+            {
+                dc.SetBrush(dc.GetBackground());
+                dc.SetPen(*wxTRANSPARENT_PEN);
+                dc.DrawRectangle(x + m_PosX + m_Width, y + m_PosY,
+                                 nextX - m_PosX - m_Width, m_Height);
+            }
+        }

     }
 }
 
     }
 }
 


@@ -1069,11 +1101,16 @@ void wxHtmlColourCell::DrawInvisible(wxDC& dc,
     {
         state.SetBgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)
     {
         state.SetBgColour(m_Colour);
         if (state.GetSelectionState() != wxHTML_SEL_IN)

+        {

             dc.SetTextBackground(m_Colour);
             dc.SetTextBackground(m_Colour);

+            dc.SetBackground(wxBrush(m_Colour, wxSOLID));
+        }

         else
         else

-            dc.SetTextBackground(
-                    info.GetStyle().GetSelectedTextBgColour(m_Colour));
-        dc.SetBackground(wxBrush(m_Colour, wxSOLID));
+        {
+            wxColour c = info.GetStyle().GetSelectedTextBgColour(m_Colour);
+            dc.SetTextBackground(c);
+            dc.SetBackground(wxBrush(c, wxSOLID));
+        }

     }
 }
 
     }
 }