extending calculation of visible region

[wxWidgets.git] / src / generic / listctrl.cpp

diff --git a/src/generic/listctrl.cpp b/src/generic/listctrl.cpp
index 394e27505cde8397c53863c66c1ed48cf09b144b..5fd80d4198f478d403a6e68e8e7231f62c2e604f 100644 (file)
--- a/src/generic/listctrl.cpp
+++ b/src/generic/listctrl.cpp
@@ -72,6 +72,9 @@
 
 #include "wx/renderer.h"
 
 
 #include "wx/renderer.h"
 

+#ifdef __WXMAC__
+    #include "wx/mac/private.h"
+#endif

 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // events
 // ----------------------------------------------------------------------------


@@ -112,7 +115,7 @@ static const int SCROLL_UNIT_X = 15;
 static const int LINE_SPACING = 0;
 
 // extra margins around the text label
 static const int LINE_SPACING = 0;
 
 // extra margins around the text label

-static const int EXTRA_WIDTH = 3;
+static const int EXTRA_WIDTH = 4;

 static const int EXTRA_HEIGHT = 4;
 
 // margin between the window and the items
 static const int EXTRA_HEIGHT = 4;
 
 // margin between the window and the items


@@ -519,7 +522,7 @@ public:
 
     // do we have a header window?
     bool HasHeader() const
 
     // do we have a header window?
     bool HasHeader() const

-        { return HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER); }
+        { return InReportView() && !HasFlag(wxLC_NO_HEADER); }

 
     void HighlightAll( bool on );
 
 
     void HighlightAll( bool on );
 


@@ -1599,7 +1602,7 @@ void wxListLineData::DrawTextFormatted(wxDC *dc,
 
 bool wxListLineData::Highlight( bool on )
 {
 
 bool wxListLineData::Highlight( bool on )
 {

-    wxCHECK_MSG( !m_owner->IsVirtual(), FALSE, _T("unexpected call to Highlight") );
+    wxCHECK_MSG( !IsVirtual(), FALSE, _T("unexpected call to Highlight") );

 
     if ( on == m_highlighted )
         return FALSE;
 
     if ( on == m_highlighted )
         return FALSE;


@@ -1732,7 +1735,8 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
         // for this we need the width of the text
         wxCoord wLabel;
 
         // for this we need the width of the text
         wxCoord wLabel;

-        dc.GetTextExtent(item.GetText(), &wLabel, NULL);
+       wxCoord hLabel;
+        dc.GetTextExtent(item.GetText(), &wLabel, &hLabel);

         wLabel += 2*EXTRA_WIDTH;
 
         // and the width of the icon, if any
         wLabel += 2*EXTRA_WIDTH;
 
         // and the width of the icon, if any


@@ -1797,7 +1801,7 @@ void wxListHeaderWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
 
         dc.DrawText( item.GetText(),
         wxDCClipper clipper(dc, x, HEADER_OFFSET_Y, cw, h - 4 );
 
         dc.DrawText( item.GetText(),

-                     xAligned + EXTRA_WIDTH, HEADER_OFFSET_Y + EXTRA_HEIGHT );
+                     xAligned + EXTRA_WIDTH, h / 2 - hLabel / 2 ); //HEADER_OFFSET_Y + EXTRA_HEIGHT );

 
         x += wCol;
     }
 
         x += wCol;
     }


@@ -1917,8 +1921,8 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
                 {
                     m_isDragging = TRUE;
                     m_currentX = x;
                 {
                     m_isDragging = TRUE;
                     m_currentX = x;

-                    DrawCurrent();

                     CaptureMouse();
                     CaptureMouse();

+                    DrawCurrent();

                 }
                 //else: column resizing was vetoed by the user code
             }
                 }
                 //else: column resizing was vetoed by the user code
             }


@@ -1953,6 +1957,7 @@ void wxListHeaderWindow::OnMouse( wxMouseEvent &event )
 void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_owner->SetFocus();
 void wxListHeaderWindow::OnSetFocus( wxFocusEvent &WXUNUSED(event) )
 {
     m_owner->SetFocus();

+    m_owner->Update();

 }
 
 bool wxListHeaderWindow::SendListEvent(wxEventType type, wxPoint pos)
 }
 
 bool wxListHeaderWindow::SendListEvent(wxEventType type, wxPoint pos)


@@ -2289,7 +2294,7 @@ wxCoord wxListMainWindow::GetLineHeight() const
 
 wxCoord wxListMainWindow::GetLineY(size_t line) const
 {
 
 wxCoord wxListMainWindow::GetLineY(size_t line) const
 {

-    wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("only works in report mode") );
+    wxASSERT_MSG( InReportView(), _T("only works in report mode") );

 
     return LINE_SPACING + line*GetLineHeight();
 }
 
     return LINE_SPACING + line*GetLineHeight();
 }


@@ -2448,7 +2453,7 @@ bool wxListMainWindow::HighlightLine( size_t line, bool highlight )
 
 void wxListMainWindow::RefreshLine( size_t line )
 {
 
 void wxListMainWindow::RefreshLine( size_t line )
 {

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);


@@ -2470,7 +2475,7 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
 
     wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") );
 
 
     wxASSERT_MSG( lineTo < GetItemCount(), _T("invalid line range") );
 

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);


@@ -2501,7 +2506,7 @@ void wxListMainWindow::RefreshLines( size_t lineFrom, size_t lineTo )
 
 void wxListMainWindow::RefreshAfter( size_t lineFrom )
 {
 
 void wxListMainWindow::RefreshAfter( size_t lineFrom )
 {

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);
     {
         size_t visibleFrom, visibleTo;
         GetVisibleLinesRange(&visibleFrom, &visibleTo);


@@ -2603,7 +2608,7 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
 
     dc.SetFont( GetFont() );
 
 
     dc.SetFont( GetFont() );
 

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         int lineHeight = GetLineHeight();
 
     {
         int lineHeight = GetLineHeight();
 


@@ -2696,22 +2701,18 @@ void wxListMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
         }
     }
 
         }
     }
 

+#ifndef __WXMAC__
+    // Don't draw rect outline under Mac at all.

     if ( HasCurrent() )
     {
     if ( HasCurrent() )
     {

-        // don't draw rect outline under Max if we already have the background
-        // color but under other platforms only draw it if we do: it is a bit
-        // silly to draw "focus rect" if we don't have focus!
-#ifdef __WXMAC__
-        if ( !m_hasFocus )
-#else // !__WXMAC__

         if ( m_hasFocus )
         if ( m_hasFocus )

-#endif // __WXMAC__/!__WXMAC__

         {
             dc.SetPen( *wxBLACK_PEN );
             dc.SetBrush( *wxTRANSPARENT_BRUSH );
             dc.DrawRectangle( GetLineHighlightRect(m_current) );
         }
     }
         {
             dc.SetPen( *wxBLACK_PEN );
             dc.SetBrush( *wxTRANSPARENT_BRUSH );
             dc.DrawRectangle( GetLineHighlightRect(m_current) );
         }
     }

+#endif

 
     dc.EndDrawing();
 }
 
     dc.EndDrawing();
 }


@@ -2866,7 +2867,7 @@ void wxListMainWindow::OnMouse( wxMouseEvent &event )
     size_t count = GetItemCount(),
            current;
 
     size_t count = GetItemCount(),
            current;
 

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         current = y / GetLineHeight();
         if ( current < count )
     {
         current = y / GetLineHeight();
         if ( current < count )


@@ -3030,7 +3031,7 @@ void wxListMainWindow::MoveToItem(size_t item)
     int view_x = SCROLL_UNIT_X*GetScrollPos( wxHORIZONTAL );
     int view_y = hLine*GetScrollPos( wxVERTICAL );
 
     int view_x = SCROLL_UNIT_X*GetScrollPos( wxHORIZONTAL );
     int view_y = hLine*GetScrollPos( wxVERTICAL );
 

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         // the next we need the range of lines shown it might be different, so
         // recalculate it
     {
         // the next we need the range of lines shown it might be different, so
         // recalculate it


@@ -3067,6 +3068,9 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
     {
         ChangeCurrent(newCurrent);
 
     {
         ChangeCurrent(newCurrent);
 

+        // refresh the old focus to remove it
+        RefreshLine( oldCurrent );
+

         // select all the items between the old and the new one
         if ( oldCurrent > newCurrent )
         {
         // select all the items between the old and the new one
         if ( oldCurrent > newCurrent )
         {


@@ -3083,7 +3087,7 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
             HighlightAll(FALSE);
 
         ChangeCurrent(newCurrent);
             HighlightAll(FALSE);
 
         ChangeCurrent(newCurrent);

-
+        

         // refresh the old focus to remove it
         RefreshLine( oldCurrent );
 
         // refresh the old focus to remove it
         RefreshLine( oldCurrent );
 


@@ -3092,7 +3096,7 @@ void wxListMainWindow::OnArrowChar(size_t newCurrent, const wxKeyEvent& event)
             HighlightLine( m_current, TRUE );
         }
     }
             HighlightLine( m_current, TRUE );
         }
     }

-
+       

     RefreshLine( m_current );
 
     MoveToFocus();
     RefreshLine( m_current );
 
     MoveToFocus();


@@ -3186,7 +3190,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 
         case WXK_PRIOR:
             {
 
         case WXK_PRIOR:
             {

-                int steps = HasFlag(wxLC_REPORT) ? m_linesPerPage - 1 : m_current % m_linesPerPage;
+                int steps = InReportView() ? m_linesPerPage - 1 : m_current % m_linesPerPage;

 
                 int index = m_current - steps;
                 if (index < 0)
 
                 int index = m_current - steps;
                 if (index < 0)


@@ -3198,7 +3202,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
 
         case WXK_NEXT:
             {
 
         case WXK_NEXT:
             {

-                int steps = HasFlag(wxLC_REPORT)
+                int steps = InReportView()

                                ? m_linesPerPage - 1
                                : m_linesPerPage - (m_current % m_linesPerPage) - 1;
 
                                ? m_linesPerPage - 1
                                : m_linesPerPage - (m_current % m_linesPerPage) - 1;
 


@@ -3212,7 +3216,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_LEFT:
             break;
 
         case WXK_LEFT:

-            if ( !HasFlag(wxLC_REPORT) )
+            if ( !InReportView() )

             {
                 int index = m_current - m_linesPerPage;
                 if (index < 0)
             {
                 int index = m_current - m_linesPerPage;
                 if (index < 0)


@@ -3223,7 +3227,7 @@ void wxListMainWindow::OnChar( wxKeyEvent &event )
             break;
 
         case WXK_RIGHT:
             break;
 
         case WXK_RIGHT:

-            if ( !HasFlag(wxLC_REPORT) )
+            if ( !InReportView() )

             {
                 size_t index = m_current + m_linesPerPage;
 
             {
                 size_t index = m_current + m_linesPerPage;
 


@@ -3334,7 +3338,7 @@ void wxListMainWindow::DrawImage( int index, wxDC *dc, int x, int y )
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }

-    else if ( HasFlag(wxLC_REPORT) && (m_small_image_list))
+    else if ( InReportView() && (m_small_image_list))

     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }
     {
         m_small_image_list->Draw( index, *dc, x, y, wxIMAGELIST_DRAW_TRANSPARENT );
     }


@@ -3354,7 +3358,7 @@ void wxListMainWindow::GetImageSize( int index, int &width, int &height ) const
     {
         m_small_image_list->GetSize( index, width, height );
     }
     {
         m_small_image_list->GetSize( index, width, height );
     }

-    else if ( HasFlag(wxLC_REPORT) && m_small_image_list )
+    else if ( InReportView() && m_small_image_list )

     {
         m_small_image_list->GetSize( index, width, height );
     }
     {
         m_small_image_list->GetSize( index, width, height );
     }


@@ -3451,7 +3455,7 @@ void wxListMainWindow::SetColumnWidth( int col, int width )
     wxCHECK_RET( col >= 0 && col < GetColumnCount(),
                  _T("invalid column index") );
 
     wxCHECK_RET( col >= 0 && col < GetColumnCount(),
                  _T("invalid column index") );
 

-    wxCHECK_RET( HasFlag(wxLC_REPORT),
+    wxCHECK_RET( InReportView(),

                  _T("SetColumnWidth() can only be called in report mode.") );
 
     m_dirty = TRUE;
                  _T("SetColumnWidth() can only be called in report mode.") );
 
     m_dirty = TRUE;


@@ -3855,7 +3859,7 @@ void wxListMainWindow::RecalculatePositions(bool noRefresh)
 
     const int lineHeight = GetLineHeight();
 
 
     const int lineHeight = GetLineHeight();
 

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         // all lines have the same height and we scroll one line per step
         int entireHeight = count*lineHeight + LINE_SPACING;
     {
         // all lines have the same height and we scroll one line per step
         int entireHeight = count*lineHeight + LINE_SPACING;


@@ -4266,7 +4270,7 @@ long wxListMainWindow::HitTest( int x, int y, int &flags )
 
     size_t count = GetItemCount();
 
 
     size_t count = GetItemCount();
 

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         size_t current = y / GetLineHeight();
         if ( current < count )
     {
         size_t current = y / GetLineHeight();
         if ( current < count )


@@ -4311,7 +4315,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
     // this is unused variable
     int mode = 0;
     #endif
     // this is unused variable
     int mode = 0;
     #endif

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         #if 0
         // this is unused variable
     {
         #if 0
         // this is unused variable


@@ -4369,7 +4373,7 @@ void wxListMainWindow::InsertItem( wxListItem &item )
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {
     m_dirty = TRUE;
 void wxListMainWindow::InsertColumn( long col, wxListItem &item )
 {
     m_dirty = TRUE;

-    if ( HasFlag(wxLC_REPORT) )
+    if ( InReportView() )

     {
         if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)
             item.m_width = GetTextLength( item.m_text );
     {
         if (item.m_width == wxLIST_AUTOSIZE_USEHEADER)
             item.m_width = GetTextLength( item.m_text );


@@ -4472,7 +4476,7 @@ int wxListMainWindow::GetCountPerPage() const
 
 void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 {
 
 void wxListMainWindow::GetVisibleLinesRange(size_t *from, size_t *to)
 {

-    wxASSERT_MSG( HasFlag(wxLC_REPORT), _T("this is for report mode only") );
+    wxASSERT_MSG( InReportView(), _T("this is for report mode only") );

 
     if ( m_lineFrom == (size_t)-1 )
     {
 
     if ( m_lineFrom == (size_t)-1 )
     {


@@ -4559,7 +4563,7 @@ void wxGenericListCtrl::CalculateAndSetHeaderHeight()
 
             m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
 
 
             m_headerWin->SetSize(m_headerWin->GetSize().x, m_headerHeight);
 

-            if ( HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER) )
+            if ( HasHeader() )

                 ResizeReportView(TRUE);
         }
     }
                 ResizeReportView(TRUE);
         }
     }


@@ -4610,7 +4614,12 @@ bool wxGenericListCtrl::Create(wxWindow *parent,
 
     m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style );
 
 
     m_mainWin = new wxListMainWindow( this, -1, wxPoint(0,0), size, style );
 

-    if ( HasFlag(wxLC_REPORT) )
+#if defined( __WXMAC__ ) && __WXMAC_CARBON__
+    wxFont font ;
+    font.MacCreateThemeFont( kThemeViewsFont ) ;
+    SetFont( font ) ;
+#endif
+    if ( InReportView() )

     {
         CreateHeaderWindow();
 
     {
         CreateHeaderWindow();
 


@@ -4660,8 +4669,8 @@ void wxGenericListCtrl::SetWindowStyleFlag( long flag )
         m_mainWin->DeleteEverything();
 
         // has the header visibility changed?
         m_mainWin->DeleteEverything();
 
         // has the header visibility changed?

-        bool hasHeader = HasFlag(wxLC_REPORT) && !HasFlag(wxLC_NO_HEADER),
-             willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);
+        bool hasHeader = HasHeader();
+        bool willHaveHeader = (flag & wxLC_REPORT) && !(flag & wxLC_NO_HEADER);

 
         if ( hasHeader != willHaveHeader )
         {
 
         if ( hasHeader != willHaveHeader )
         {