Added more 3d rendering to row and col labels and removed sunken border style from...

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

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index 9322592aa8e761b366e5a470d82fcd9983c1d312..a999ea3e08a6717f7f331a6dacd0caf4e4ddf0b5 100644 (file)
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -854,7 +854,7 @@ wxGridWindow::wxGridWindow( wxGrid *parent,
                             wxGridRowLabelWindow *rowLblWin,
                             wxGridColLabelWindow *colLblWin,
                             wxWindowID id, const wxPoint &pos, const wxSize &size )
                             wxGridRowLabelWindow *rowLblWin,
                             wxGridColLabelWindow *colLblWin,
                             wxWindowID id, const wxPoint &pos, const wxSize &size )

-        : wxPanel( parent, id, pos, size, wxSUNKEN_BORDER, "grid window" )
+        : wxPanel( parent, id, pos, size, 0, "grid window" )

 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;
 {
     m_owner = parent;
     m_rowLabelWin = rowLblWin;


@@ -1124,8 +1124,8 @@ void wxGrid::CalcDimensions()
 
     if ( m_numRows > 0  &&  m_numCols > 0 )
     {
 
     if ( m_numRows > 0  &&  m_numCols > 0 )
     {

-        int right = m_colRights[ m_numCols-1 ] + 20;
-        int bottom = m_rowBottoms[ m_numRows-1 ] + 20;
+        int right = m_colRights[ m_numCols-1 ] + 50;
+        int bottom = m_rowBottoms[ m_numRows-1 ] + 50;

 
         // TODO: restore the scroll position that we had before sizing
         //
 
         // TODO: restore the scroll position that we had before sizing
         //


@@ -1600,7 +1600,7 @@ void wxGrid::ProcessRowLabelMouseEvent( wxMouseEvent& event )
                   rect.height = ch - rect.y;
                   m_rowLabelWin->Refresh( TRUE, &rect );
                   rect.width = cw;
                   rect.height = ch - rect.y;
                   m_rowLabelWin->Refresh( TRUE, &rect );
                   rect.width = cw;

-                  m_gridWin->Refresh( TRUE, &rect );
+                  m_gridWin->Refresh( FALSE, &rect );

                 }
 
                 ShowCellEditControl();
                 }
 
                 ShowCellEditControl();


@@ -1787,7 +1787,7 @@ void wxGrid::ProcessColLabelMouseEvent( wxMouseEvent& event )
                   rect.height = m_colLabelHeight;
                   m_colLabelWin->Refresh( TRUE, &rect );
                   rect.height = ch;
                   rect.height = m_colLabelHeight;
                   m_colLabelWin->Refresh( TRUE, &rect );
                   rect.height = ch;

-                  m_gridWin->Refresh( TRUE, &rect );
+                  m_gridWin->Refresh( FALSE, &rect );

                 }
 
                 ShowCellEditControl();
                 }
 
                 ShowCellEditControl();


@@ -2558,7 +2558,7 @@ void wxGrid::SetCurrentCell( const wxGridCellCoords& coords )
     {
         wxRect r( SelectionToDeviceRect() );
         ClearSelection();
     {
         wxRect r( SelectionToDeviceRect() );
         ClearSelection();

-        if ( !GetBatchCount() ) m_gridWin->Refresh( TRUE, &r );
+        if ( !GetBatchCount() ) m_gridWin->Refresh( FALSE, &r );

     }
 }
 
     }
 }
 


@@ -2814,18 +2814,18 @@ void wxGrid::DrawRowLabel( wxDC& dc, int row )
 {
     if ( m_rowHeights[row] <= 0 ) return;
 
 {
     if ( m_rowHeights[row] <= 0 ) return;
 

-    // draw the label's horizontal border (the vertical border is
-    // provided by the cell area window margin)
-    //
+    int rowTop = m_rowBottoms[row] - m_rowHeights[row];
+    

     dc.SetPen( *wxBLACK_PEN );
     dc.SetPen( *wxBLACK_PEN );

-
-    dc.DrawLine( 0, m_rowBottoms[row]+1,
-                 m_rowLabelWidth, m_rowBottoms[row]+1 );
-
+    dc.DrawLine( m_rowLabelWidth-1, rowTop,
+                 m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+    
+    dc.DrawLine( 0, m_rowBottoms[row]-1,
+                 m_rowLabelWidth-1, m_rowBottoms[row]-1 );
+    

     dc.SetPen( *wxWHITE_PEN );
     dc.SetPen( *wxWHITE_PEN );

-
-    dc.DrawLine( 0, m_rowBottoms[row]+2,
-                 m_rowLabelWidth, m_rowBottoms[row]+2 );
+    dc.DrawLine( 0, rowTop, 0, m_rowBottoms[row]-1 );
+    dc.DrawLine( 0, rowTop, m_rowLabelWidth-1, rowTop );

 
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
 
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );


@@ -2861,18 +2861,22 @@ void wxGrid::DrawColLabel( wxDC& dc, int col )
 {
     if ( m_colWidths[col] <= 0 ) return;
 
 {
     if ( m_colWidths[col] <= 0 ) return;
 

-    // draw the label's vertical border (the horizontal border is
-    // provided by the cell area window margin)
-    //
+    int colLeft = m_colRights[col] - m_colWidths[col];
+    

     dc.SetPen( *wxBLACK_PEN );
     dc.SetPen( *wxBLACK_PEN );

-
-    dc.DrawLine( m_colRights[col]+1, 0,
-                 m_colRights[col]+1, m_colLabelHeight );
-
+    dc.DrawLine( m_colRights[col]-1, 0,
+                 m_colRights[col]-1, m_colLabelHeight-1 );
+    
+    dc.DrawLine( colLeft, m_colLabelHeight-1,
+                 m_colRights[col]-1, m_colLabelHeight-1 );
+    

     dc.SetPen( *wxWHITE_PEN );
     dc.SetPen( *wxWHITE_PEN );

+    dc.DrawLine( colLeft, 0, colLeft, m_colLabelHeight-1 );
+    dc.DrawLine( colLeft, 0, m_colRights[col]-1, 0 );

 
 

-    dc.DrawLine( m_colRights[col]+2, 0,
-                 m_colRights[col]+2, m_colLabelHeight );
+    dc.SetBackgroundMode( wxTRANSPARENT );
+    dc.SetTextForeground( GetLabelTextColour() );
+    dc.SetFont( GetLabelFont() );

 
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );
 
     dc.SetBackgroundMode( wxTRANSPARENT );
     dc.SetTextForeground( GetLabelTextColour() );


@@ -3878,16 +3882,157 @@ wxString wxGrid::GetColLabelValue( int col )
     }
 }
 
     }
 }
 

+

 void wxGrid::SetRowLabelSize( int width )
 {
 void wxGrid::SetRowLabelSize( int width )
 {

-    // TODO: how to do this with the box sizers ?
+    wxSize sz;
+    
+    width = wxMax( width, 0 );
+    if ( width != m_rowLabelWidth )
+    {
+        // Hiding the row labels (and possible the corner label)
+        //
+        if ( width == 0 )
+        {
+            m_rowLabelWin->Show( FALSE );
+
+            // If the col labels are on display we need to hide the
+            // corner label and remove it from the top sizer
+            //
+            if ( m_colLabelHeight > 0 )
+            {
+                m_cornerLabelWin->Show( FALSE );
+                m_topSizer->Remove( m_cornerLabelWin );
+            }
+            
+            m_middleSizer->Remove( m_rowLabelWin );
+        }
+        else
+        {
+            // Displaying the row labels (and possibly the corner
+            // label) after being hidden
+            //
+            if ( m_rowLabelWidth == 0 )
+            {
+                m_rowLabelWin->Show( TRUE );
+                
+                if ( m_colLabelHeight > 0 )
+                {
+                    m_cornerLabelWin->Show( TRUE );
+                    m_topSizer->Prepend( m_cornerLabelWin, 0 );
+                }
+
+                m_middleSizer->Prepend( m_rowLabelWin, 0, wxEXPAND );
+            }
+
+
+            // set the width of the corner label if it is on display
+            //
+            if ( m_colLabelHeight > 0 )
+            {
+                wxList& childList = m_topSizer->GetChildren();
+                wxNode *node = childList.First();
+                while (node)
+                {
+                    wxSizerItem *item = (wxSizerItem*)node->Data();
+                    if ( item->GetWindow() == m_cornerLabelWin )
+                    {
+                        item->SetInitSize( width, m_colLabelHeight );
+                        break;
+                    }
+                    node = node->Next();
+                }
+            }
+
+            // set the width of the row labels
+            //
+            wxList& childList = m_middleSizer->GetChildren();
+            wxNode *node = childList.First();
+            while (node)
+            {
+                wxSizerItem *item = (wxSizerItem*)node->Data();
+                if ( item->GetWindow() == m_rowLabelWin )
+                {
+                    sz = item->GetWindow()->GetSize();
+                    item->SetInitSize( width, sz.GetHeight() );
+                    break;
+                }
+                node = node->Next();
+            }            
+        }
+    
+        m_rowLabelWidth = width;
+        m_mainSizer->Layout();
+    }

 }
 
 }
 

+

 void wxGrid::SetColLabelSize( int height )
 {
 void wxGrid::SetColLabelSize( int height )
 {

-    // TODO: how to do this with the box sizers ?
+    wxSize sz;
+
+    if ( height < 0 ) height = 0;
+    if ( height != m_colLabelHeight )
+    {
+        // hiding the column labels
+        //
+        if ( height == 0 )
+        {
+            m_cornerLabelWin->Show( FALSE );
+            m_colLabelWin->Show( FALSE );
+
+            // Note: this call will actually delete the sizer
+            //
+            m_mainSizer->Remove( m_topSizer );
+            m_topSizer = (wxBoxSizer *)NULL;
+        }
+        else
+        {
+            // column labels to be displayed after being hidden
+            //
+            if ( m_colLabelHeight == 0 )
+            {
+                // recreate the top sizer
+                //
+                m_topSizer = new wxBoxSizer( wxHORIZONTAL );
+
+                if ( m_rowLabelWidth > 0 )
+                    m_topSizer->Add( m_cornerLabelWin, 0 );
+
+                m_topSizer->Add( m_colLabelWin, 1 );
+                m_mainSizer->Prepend( m_topSizer, 0, wxEXPAND );
+
+                // only show the corner label if the row labels are
+                // also displayed
+                //
+                if ( m_rowLabelWidth > 0 )
+                    m_cornerLabelWin->Show( TRUE );
+                
+                m_colLabelWin->Show( TRUE );
+            }
+            
+            wxList& childList = m_topSizer->GetChildren();
+            wxNode *node = childList.First();
+            while (node)
+            {
+                wxSizerItem *item = (wxSizerItem*)node->Data();
+
+                if ( (item->GetWindow() == m_cornerLabelWin && m_rowLabelWidth > 0) ||
+                     item->GetWindow() == m_colLabelWin )
+                {
+                    sz = item->GetWindow()->GetSize();
+                    item->SetInitSize( sz.GetWidth(), height );
+                }
+                node = node->Next();
+            }
+        }
+    
+        m_colLabelHeight = height;
+        m_mainSizer->Layout();
+    }

 }
 
 }
 

+

 void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
 {
     if ( m_labelBackgroundColour != colour )
 void wxGrid::SetLabelBackgroundColour( const wxColour& colour )
 {
     if ( m_labelBackgroundColour != colour )


@@ -4011,7 +4156,7 @@ void wxGrid::SetGridLineColour( const wxColour& colour )
 
         wxClientDC dc( m_gridWin );
         PrepareDC( dc );
 
         wxClientDC dc( m_gridWin );
         PrepareDC( dc );

-        DrawAllGridLines( dc );
+        DrawAllGridLines( dc, wxRegion() );

     }
 }
 
     }
 }
 


@@ -4027,7 +4172,7 @@ void wxGrid::EnableGridLines( bool enable )
             {
                 wxClientDC dc( m_gridWin );
                 PrepareDC( dc );
             {
                 wxClientDC dc( m_gridWin );
                 PrepareDC( dc );

-                DrawAllGridLines( dc );
+                DrawAllGridLines( dc, wxRegion() );

             }
             else
             {
             }
             else
             {


@@ -4351,18 +4496,18 @@ void wxGrid::SelectRow( int row, bool addToSelected )
 
         for (i = 0; i < 4; i++ )
             if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
 
         for (i = 0; i < 4; i++ )
             if ( need_refresh[i] && rect[i] != wxGridNoCellRect )

-                m_gridWin->Refresh( TRUE, &(rect[i]) );
+                m_gridWin->Refresh( FALSE, &(rect[i]) );

     }
     else
     {
         r = SelectionToDeviceRect();
         ClearSelection();
     }
     else
     {
         r = SelectionToDeviceRect();
         ClearSelection();

-        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r );
+        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );

 
         m_selectedTopLeft.Set( row, 0 );
         m_selectedBottomRight.Set( row, m_numCols-1 );
         r = SelectionToDeviceRect();
 
         m_selectedTopLeft.Set( row, 0 );
         m_selectedBottomRight.Set( row, m_numCols-1 );
         r = SelectionToDeviceRect();

-        m_gridWin->Refresh( TRUE, &r );
+        m_gridWin->Refresh( FALSE, &r );

     }
 
     wxGridRangeSelectEvent gridEvt( GetId(),
     }
 
     wxGridRangeSelectEvent gridEvt( GetId(),


@@ -4427,7 +4572,7 @@ void wxGrid::SelectCol( int col, bool addToSelected )
 
         for (i = 0; i < 4; i++ )
             if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
 
         for (i = 0; i < 4; i++ )
             if ( need_refresh[i] && rect[i] != wxGridNoCellRect )

-                m_gridWin->Refresh( TRUE, &(rect[i]) );
+                m_gridWin->Refresh( FALSE, &(rect[i]) );

     }
     else
     {
     }
     else
     {


@@ -4435,12 +4580,12 @@ void wxGrid::SelectCol( int col, bool addToSelected )
     
         r = SelectionToDeviceRect();
         ClearSelection();
     
         r = SelectionToDeviceRect();
         ClearSelection();

-        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( TRUE, &r );
+        if ( r != wxGridNoCellRect ) m_gridWin->Refresh( FALSE, &r );

 
         m_selectedTopLeft.Set( 0, col );
         m_selectedBottomRight.Set( m_numRows-1, col );
         r = SelectionToDeviceRect();
 
         m_selectedTopLeft.Set( 0, col );
         m_selectedBottomRight.Set( m_numRows-1, col );
         r = SelectionToDeviceRect();

-        m_gridWin->Refresh( TRUE, &r );
+        m_gridWin->Refresh( FALSE, &r );

     }
 
     wxGridRangeSelectEvent gridEvt( GetId(),
     }
 
     wxGridRangeSelectEvent gridEvt( GetId(),


@@ -4565,7 +4710,7 @@ void wxGrid::SelectBlock( int topRow, int leftCol, int bottomRow, int rightCol )
         // various Refresh() calls
         for (i = 0; i < 4; i++ )
             if ( need_refresh[i] && rect[i] != wxGridNoCellRect )
         // various Refresh() calls
         for (i = 0; i < 4; i++ )
             if ( need_refresh[i] && rect[i] != wxGridNoCellRect )

-                m_gridWin->Refresh( TRUE, &(rect[i]) );
+                m_gridWin->Refresh( FALSE, &(rect[i]) );

     }
 
     // only generate an event if the block is not being selected by
     }
 
     // only generate an event if the block is not being selected by