Correct background colourin wxDataViewCtrl, Use IsOk() instead of Ok()
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@50788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
@@ -481,7 +481,7 @@ public:
|
|||||||
if (row >= m_array.GetCount())
|
if (row >= m_array.GetCount())
|
||||||
variant = "plain";
|
variant = "plain";
|
||||||
else
|
else
|
||||||
variant = "blue italic";
|
variant = "blue";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1105,7 +1105,7 @@ wxWindowBase::GetClassDefaultAttributes(wxWindowVariant WXUNUSED(variant))
|
|||||||
|
|
||||||
wxColour wxWindowBase::GetBackgroundColour() const
|
wxColour wxWindowBase::GetBackgroundColour() const
|
||||||
{
|
{
|
||||||
if ( !m_backgroundColour.Ok() )
|
if ( !m_backgroundColour.IsOk() )
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( !m_hasBgCol, _T("we have invalid explicit bg colour?") );
|
wxASSERT_MSG( !m_hasBgCol, _T("we have invalid explicit bg colour?") );
|
||||||
|
|
||||||
@@ -1133,7 +1133,7 @@ wxColour wxWindowBase::GetForegroundColour() const
|
|||||||
{
|
{
|
||||||
wxColour colFg = GetDefaultAttributes().colFg;
|
wxColour colFg = GetDefaultAttributes().colFg;
|
||||||
|
|
||||||
if ( !colFg.Ok() )
|
if ( !colFg.IsOk() )
|
||||||
colFg = GetClassDefaultAttributes().colFg;
|
colFg = GetClassDefaultAttributes().colFg;
|
||||||
|
|
||||||
return colFg;
|
return colFg;
|
||||||
@@ -1147,7 +1147,7 @@ bool wxWindowBase::SetBackgroundColour( const wxColour &colour )
|
|||||||
if ( colour == m_backgroundColour )
|
if ( colour == m_backgroundColour )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
m_hasBgCol = colour.Ok();
|
m_hasBgCol = colour.IsOk();
|
||||||
if ( m_backgroundStyle != wxBG_STYLE_CUSTOM )
|
if ( m_backgroundStyle != wxBG_STYLE_CUSTOM )
|
||||||
m_backgroundStyle = m_hasBgCol ? wxBG_STYLE_COLOUR : wxBG_STYLE_SYSTEM;
|
m_backgroundStyle = m_hasBgCol ? wxBG_STYLE_COLOUR : wxBG_STYLE_SYSTEM;
|
||||||
|
|
||||||
@@ -1162,7 +1162,7 @@ bool wxWindowBase::SetForegroundColour( const wxColour &colour )
|
|||||||
if (colour == m_foregroundColour )
|
if (colour == m_foregroundColour )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
m_hasFgCol = colour.Ok();
|
m_hasFgCol = colour.IsOk();
|
||||||
m_inheritFgCol = m_hasFgCol;
|
m_inheritFgCol = m_hasFgCol;
|
||||||
m_foregroundColour = colour;
|
m_foregroundColour = colour;
|
||||||
SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() );
|
SetThemeEnabled( !m_hasFgCol && !m_backgroundColour.Ok() );
|
||||||
@@ -1187,12 +1187,12 @@ bool wxWindowBase::SetCursor(const wxCursor& cursor)
|
|||||||
wxFont wxWindowBase::GetFont() const
|
wxFont wxWindowBase::GetFont() const
|
||||||
{
|
{
|
||||||
// logic is the same as in GetBackgroundColour()
|
// logic is the same as in GetBackgroundColour()
|
||||||
if ( !m_font.Ok() )
|
if ( !m_font.IsOk() )
|
||||||
{
|
{
|
||||||
wxASSERT_MSG( !m_hasFont, _T("we have invalid explicit font?") );
|
wxASSERT_MSG( !m_hasFont, _T("we have invalid explicit font?") );
|
||||||
|
|
||||||
wxFont font = GetDefaultAttributes().font;
|
wxFont font = GetDefaultAttributes().font;
|
||||||
if ( !font.Ok() )
|
if ( !font.IsOk() )
|
||||||
font = GetClassDefaultAttributes().font;
|
font = GetClassDefaultAttributes().font;
|
||||||
|
|
||||||
return font;
|
return font;
|
||||||
@@ -1210,7 +1210,7 @@ bool wxWindowBase::SetFont(const wxFont& font)
|
|||||||
}
|
}
|
||||||
|
|
||||||
m_font = font;
|
m_font = font;
|
||||||
m_hasFont = font.Ok();
|
m_hasFont = font.IsOk();
|
||||||
m_inheritFont = m_hasFont;
|
m_inheritFont = m_hasFont;
|
||||||
|
|
||||||
InvalidateBestSize();
|
InvalidateBestSize();
|
||||||
|
|||||||
@@ -1924,7 +1924,6 @@ wxDataViewMainWindow::wxDataViewMainWindow( wxDataViewCtrl *parent, wxWindowID i
|
|||||||
|
|
||||||
m_hasFocus = false;
|
m_hasFocus = false;
|
||||||
|
|
||||||
SetBackgroundStyle( wxBG_STYLE_CUSTOM );
|
|
||||||
SetBackgroundColour( *wxWHITE );
|
SetBackgroundColour( *wxWHITE );
|
||||||
|
|
||||||
m_penRule = wxPen(GetRuleColour(), 1, wxSOLID);
|
m_penRule = wxPen(GetRuleColour(), 1, wxSOLID);
|
||||||
@@ -1947,6 +1946,279 @@ wxDataViewMainWindow::~wxDataViewMainWindow()
|
|||||||
delete m_renameTimer;
|
delete m_renameTimer;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
|
||||||
|
{
|
||||||
|
wxDataViewModel *model = GetOwner()->GetModel();
|
||||||
|
wxAutoBufferedPaintDC dc( this );
|
||||||
|
|
||||||
|
#ifdef __WXMSW__
|
||||||
|
dc.SetPen( *wxTRANSPARENT_PEN );
|
||||||
|
dc.SetBrush( wxBrush( GetBackgroundColour()) );
|
||||||
|
dc.SetBrush( *wxWHITE_BRUSH );
|
||||||
|
wxSize size( GetClientSize() );
|
||||||
|
dc.DrawRectangle( 0,0,size.x,size.y );
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// prepare the DC
|
||||||
|
GetOwner()->PrepareDC( dc );
|
||||||
|
dc.SetFont( GetFont() );
|
||||||
|
|
||||||
|
wxRect update = GetUpdateRegion().GetBox();
|
||||||
|
m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y );
|
||||||
|
|
||||||
|
// compute which items needs to be redrawn
|
||||||
|
unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) );
|
||||||
|
unsigned int item_count =
|
||||||
|
wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1),
|
||||||
|
(int)(GetRowCount( ) - item_start));
|
||||||
|
unsigned int item_last = item_start + item_count;
|
||||||
|
|
||||||
|
// compute which columns needs to be redrawn
|
||||||
|
unsigned int cols = GetOwner()->GetColumnCount();
|
||||||
|
unsigned int col_start = 0;
|
||||||
|
unsigned int x_start = 0;
|
||||||
|
for (x_start = 0; col_start < cols; col_start++)
|
||||||
|
{
|
||||||
|
wxDataViewColumn *col = GetOwner()->GetColumn(col_start);
|
||||||
|
if (col->IsHidden())
|
||||||
|
continue; // skip it!
|
||||||
|
|
||||||
|
unsigned int w = col->GetWidth();
|
||||||
|
if (x_start+w >= (unsigned int)update.x)
|
||||||
|
break;
|
||||||
|
|
||||||
|
x_start += w;
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned int col_last = col_start;
|
||||||
|
unsigned int x_last = x_start;
|
||||||
|
for (; col_last < cols; col_last++)
|
||||||
|
{
|
||||||
|
wxDataViewColumn *col = GetOwner()->GetColumn(col_last);
|
||||||
|
if (col->IsHidden())
|
||||||
|
continue; // skip it!
|
||||||
|
|
||||||
|
if (x_last > (unsigned int)update.GetRight())
|
||||||
|
break;
|
||||||
|
|
||||||
|
x_last += col->GetWidth();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw horizontal rules if required
|
||||||
|
if ( m_owner->HasFlag(wxDV_HORIZ_RULES) )
|
||||||
|
{
|
||||||
|
dc.SetPen(m_penRule);
|
||||||
|
dc.SetBrush(*wxTRANSPARENT_BRUSH);
|
||||||
|
|
||||||
|
for (unsigned int i = item_start; i <= item_last+1; i++)
|
||||||
|
{
|
||||||
|
int y = i * m_lineHeight;
|
||||||
|
dc.DrawLine(x_start, y, x_last, y);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw vertical rules if required
|
||||||
|
if ( m_owner->HasFlag(wxDV_VERT_RULES) )
|
||||||
|
{
|
||||||
|
dc.SetPen(m_penRule);
|
||||||
|
dc.SetBrush(*wxTRANSPARENT_BRUSH);
|
||||||
|
|
||||||
|
int x = x_start;
|
||||||
|
for (unsigned int i = col_start; i < col_last; i++)
|
||||||
|
{
|
||||||
|
wxDataViewColumn *col = GetOwner()->GetColumn(i);
|
||||||
|
if (col->IsHidden())
|
||||||
|
continue; // skip it
|
||||||
|
|
||||||
|
dc.DrawLine(x, item_start * m_lineHeight,
|
||||||
|
x, item_last * m_lineHeight);
|
||||||
|
|
||||||
|
x += col->GetWidth();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Draw last vertical rule
|
||||||
|
dc.DrawLine(x, item_start * m_lineHeight,
|
||||||
|
x, item_last * m_lineHeight);
|
||||||
|
}
|
||||||
|
|
||||||
|
// redraw the background for the items which are selected/current
|
||||||
|
for (unsigned int item = item_start; item < item_last; item++)
|
||||||
|
{
|
||||||
|
bool selected = m_selection.Index( item ) != wxNOT_FOUND;
|
||||||
|
if (selected || item == m_currentRow)
|
||||||
|
{
|
||||||
|
int flags = selected ? (int)wxCONTROL_SELECTED : 0;
|
||||||
|
if (item == m_currentRow)
|
||||||
|
flags |= wxCONTROL_CURRENT;
|
||||||
|
if (m_hasFocus)
|
||||||
|
flags |= wxCONTROL_FOCUSED;
|
||||||
|
|
||||||
|
wxRect rect( x_start, item*m_lineHeight, x_last, m_lineHeight );
|
||||||
|
wxRendererNative::Get().DrawItemSelectionRect
|
||||||
|
(
|
||||||
|
this,
|
||||||
|
dc,
|
||||||
|
rect,
|
||||||
|
flags
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
|
||||||
|
if (!expander)
|
||||||
|
{
|
||||||
|
// TODO: last column for RTL support
|
||||||
|
expander = GetOwner()->GetColumn( 0 );
|
||||||
|
GetOwner()->SetExpanderColumn(expander);
|
||||||
|
}
|
||||||
|
|
||||||
|
// redraw all cells for all rows which must be repainted and for all columns
|
||||||
|
wxRect cell_rect;
|
||||||
|
cell_rect.x = x_start;
|
||||||
|
cell_rect.height = m_lineHeight; // -1 is for the horizontal rules
|
||||||
|
for (unsigned int i = col_start; i < col_last; i++)
|
||||||
|
{
|
||||||
|
wxDataViewColumn *col = GetOwner()->GetColumn( i );
|
||||||
|
wxDataViewRenderer *cell = col->GetRenderer();
|
||||||
|
cell_rect.width = col->GetWidth();
|
||||||
|
|
||||||
|
if (col->IsHidden())
|
||||||
|
continue; // skipt it!
|
||||||
|
|
||||||
|
|
||||||
|
for (unsigned int item = item_start; item < item_last; item++)
|
||||||
|
{
|
||||||
|
// get the cell value and set it into the renderer
|
||||||
|
wxVariant value;
|
||||||
|
wxDataViewTreeNode *node = NULL;
|
||||||
|
wxDataViewItem dataitem;
|
||||||
|
|
||||||
|
if (m_root)
|
||||||
|
{
|
||||||
|
node = GetTreeNodeByRow(item);
|
||||||
|
if( node == NULL )
|
||||||
|
continue;
|
||||||
|
|
||||||
|
dataitem = node->GetItem();
|
||||||
|
|
||||||
|
if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
dataitem = wxDataViewItem( (void*) item );
|
||||||
|
}
|
||||||
|
|
||||||
|
model->GetValue( value, dataitem, col->GetModelColumn());
|
||||||
|
cell->SetValue( value );
|
||||||
|
|
||||||
|
if (cell->GetWantsAttr())
|
||||||
|
{
|
||||||
|
wxDataViewItemAttr attr;
|
||||||
|
bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr );
|
||||||
|
if (ret)
|
||||||
|
cell->SetAttr( attr );
|
||||||
|
cell->SetHasAttr( ret );
|
||||||
|
}
|
||||||
|
|
||||||
|
// update the y offset
|
||||||
|
cell_rect.y = item * m_lineHeight;
|
||||||
|
|
||||||
|
//Draw the expander here.
|
||||||
|
int indent = 0;
|
||||||
|
if ((m_root) && (col == expander))
|
||||||
|
{
|
||||||
|
indent = node->GetIndentLevel();
|
||||||
|
|
||||||
|
//Calculate the indent first
|
||||||
|
indent = cell_rect.x + GetOwner()->GetIndent() * indent;
|
||||||
|
|
||||||
|
int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
|
||||||
|
// change the cell_rect.x to the appropriate pos
|
||||||
|
int expander_x = indent + EXPANDER_MARGIN , expander_y = cell_rect.y + EXPANDER_MARGIN ;
|
||||||
|
indent = indent + m_lineHeight ; //try to use the m_lineHeight as the expander space
|
||||||
|
dc.SetPen( m_penExpander );
|
||||||
|
dc.SetBrush( wxNullBrush );
|
||||||
|
if( node->HasChildren() )
|
||||||
|
{
|
||||||
|
wxRect rect( expander_x , expander_y, expander_width, expander_width);
|
||||||
|
int flag = 0;
|
||||||
|
if (m_underMouse == node)
|
||||||
|
{
|
||||||
|
flag |= wxCONTROL_CURRENT;
|
||||||
|
}
|
||||||
|
if( node->IsOpen() )
|
||||||
|
wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED );
|
||||||
|
else
|
||||||
|
wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// I am wondering whether we should draw dot lines between tree nodes
|
||||||
|
if (node)
|
||||||
|
delete node;
|
||||||
|
// Yes, if the node does not have any child, it must be a leaf which
|
||||||
|
// mean that it is a temporarily created by GetTreeNodeByRow
|
||||||
|
}
|
||||||
|
|
||||||
|
//force the expander column to left-center align
|
||||||
|
cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// cannot be bigger than allocated space
|
||||||
|
wxSize size = cell->GetSize();
|
||||||
|
// Because of the tree structure indent, here we should minus the width of the cell for drawing
|
||||||
|
size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );
|
||||||
|
// size.y = wxMin( size.y, cell_rect.height );
|
||||||
|
size.y = cell_rect.height;
|
||||||
|
|
||||||
|
wxRect item_rect(cell_rect.GetTopLeft(), size);
|
||||||
|
int align = cell->GetAlignment();
|
||||||
|
|
||||||
|
// horizontal alignment:
|
||||||
|
item_rect.x = cell_rect.x;
|
||||||
|
if (align & wxALIGN_CENTER_HORIZONTAL)
|
||||||
|
item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2);
|
||||||
|
else if (align & wxALIGN_RIGHT)
|
||||||
|
item_rect.x = cell_rect.x + cell_rect.width - size.x;
|
||||||
|
//else: wxALIGN_LEFT is the default
|
||||||
|
|
||||||
|
// vertical alignment:
|
||||||
|
item_rect.y = cell_rect.y;
|
||||||
|
if (align & wxALIGN_CENTER_VERTICAL)
|
||||||
|
item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2);
|
||||||
|
else if (align & wxALIGN_BOTTOM)
|
||||||
|
item_rect.y = cell_rect.y + cell_rect.height - size.y;
|
||||||
|
//else: wxALIGN_TOP is the default
|
||||||
|
|
||||||
|
// add padding
|
||||||
|
item_rect.x += PADDING_RIGHTLEFT;
|
||||||
|
item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
|
||||||
|
|
||||||
|
//Here we add the tree indent
|
||||||
|
item_rect.x += indent;
|
||||||
|
|
||||||
|
int state = 0;
|
||||||
|
if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
|
||||||
|
state |= wxDATAVIEW_CELL_SELECTED;
|
||||||
|
|
||||||
|
// TODO: it would be much more efficient to create a clipping
|
||||||
|
// region for the entire column being rendered (in the OnPaint
|
||||||
|
// of wxDataViewMainWindow) instead of a single clip region for
|
||||||
|
// each cell. However it would mean that each renderer should
|
||||||
|
// respect the given wxRect's top & bottom coords, eventually
|
||||||
|
// violating only the left & right coords - however the user can
|
||||||
|
// make its own renderer and thus we cannot be sure of that.
|
||||||
|
dc.SetClippingRegion( item_rect );
|
||||||
|
cell->Render( item_rect, &dc, state );
|
||||||
|
dc.DestroyClippingRegion();
|
||||||
|
}
|
||||||
|
|
||||||
|
cell_rect.x += cell_rect.width;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void wxDataViewMainWindow::OnRenameTimer()
|
void wxDataViewMainWindow::OnRenameTimer()
|
||||||
{
|
{
|
||||||
// We have to call this here because changes may just have
|
// We have to call this here because changes may just have
|
||||||
@@ -2295,273 +2567,6 @@ void wxDataViewMainWindow::ScrollTo( int rows, int column )
|
|||||||
m_owner->Scroll( sx, sy );
|
m_owner->Scroll( sx, sy );
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxDataViewMainWindow::OnPaint( wxPaintEvent &WXUNUSED(event) )
|
|
||||||
{
|
|
||||||
wxDataViewModel *model = GetOwner()->GetModel();
|
|
||||||
wxAutoBufferedPaintDC dc( this );
|
|
||||||
|
|
||||||
// prepare the DC
|
|
||||||
dc.SetBackground(GetBackgroundColour());
|
|
||||||
dc.Clear();
|
|
||||||
GetOwner()->PrepareDC( dc );
|
|
||||||
dc.SetFont( GetFont() );
|
|
||||||
|
|
||||||
wxRect update = GetUpdateRegion().GetBox();
|
|
||||||
m_owner->CalcUnscrolledPosition( update.x, update.y, &update.x, &update.y );
|
|
||||||
|
|
||||||
// compute which items needs to be redrawn
|
|
||||||
unsigned int item_start = wxMax( 0, (update.y / m_lineHeight) );
|
|
||||||
unsigned int item_count =
|
|
||||||
wxMin( (int)(((update.y + update.height) / m_lineHeight) - item_start + 1),
|
|
||||||
(int)(GetRowCount( ) - item_start));
|
|
||||||
unsigned int item_last = item_start + item_count;
|
|
||||||
|
|
||||||
// compute which columns needs to be redrawn
|
|
||||||
unsigned int cols = GetOwner()->GetColumnCount();
|
|
||||||
unsigned int col_start = 0;
|
|
||||||
unsigned int x_start = 0;
|
|
||||||
for (x_start = 0; col_start < cols; col_start++)
|
|
||||||
{
|
|
||||||
wxDataViewColumn *col = GetOwner()->GetColumn(col_start);
|
|
||||||
if (col->IsHidden())
|
|
||||||
continue; // skip it!
|
|
||||||
|
|
||||||
unsigned int w = col->GetWidth();
|
|
||||||
if (x_start+w >= (unsigned int)update.x)
|
|
||||||
break;
|
|
||||||
|
|
||||||
x_start += w;
|
|
||||||
}
|
|
||||||
|
|
||||||
unsigned int col_last = col_start;
|
|
||||||
unsigned int x_last = x_start;
|
|
||||||
for (; col_last < cols; col_last++)
|
|
||||||
{
|
|
||||||
wxDataViewColumn *col = GetOwner()->GetColumn(col_last);
|
|
||||||
if (col->IsHidden())
|
|
||||||
continue; // skip it!
|
|
||||||
|
|
||||||
if (x_last > (unsigned int)update.GetRight())
|
|
||||||
break;
|
|
||||||
|
|
||||||
x_last += col->GetWidth();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Draw horizontal rules if required
|
|
||||||
if ( m_owner->HasFlag(wxDV_HORIZ_RULES) )
|
|
||||||
{
|
|
||||||
dc.SetPen(m_penRule);
|
|
||||||
dc.SetBrush(*wxTRANSPARENT_BRUSH);
|
|
||||||
|
|
||||||
for (unsigned int i = item_start; i <= item_last+1; i++)
|
|
||||||
{
|
|
||||||
int y = i * m_lineHeight;
|
|
||||||
dc.DrawLine(x_start, y, x_last, y);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Draw vertical rules if required
|
|
||||||
if ( m_owner->HasFlag(wxDV_VERT_RULES) )
|
|
||||||
{
|
|
||||||
dc.SetPen(m_penRule);
|
|
||||||
dc.SetBrush(*wxTRANSPARENT_BRUSH);
|
|
||||||
|
|
||||||
int x = x_start;
|
|
||||||
for (unsigned int i = col_start; i < col_last; i++)
|
|
||||||
{
|
|
||||||
wxDataViewColumn *col = GetOwner()->GetColumn(i);
|
|
||||||
if (col->IsHidden())
|
|
||||||
continue; // skip it
|
|
||||||
|
|
||||||
dc.DrawLine(x, item_start * m_lineHeight,
|
|
||||||
x, item_last * m_lineHeight);
|
|
||||||
|
|
||||||
x += col->GetWidth();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Draw last vertical rule
|
|
||||||
dc.DrawLine(x, item_start * m_lineHeight,
|
|
||||||
x, item_last * m_lineHeight);
|
|
||||||
}
|
|
||||||
|
|
||||||
// redraw the background for the items which are selected/current
|
|
||||||
for (unsigned int item = item_start; item < item_last; item++)
|
|
||||||
{
|
|
||||||
bool selected = m_selection.Index( item ) != wxNOT_FOUND;
|
|
||||||
if (selected || item == m_currentRow)
|
|
||||||
{
|
|
||||||
int flags = selected ? (int)wxCONTROL_SELECTED : 0;
|
|
||||||
if (item == m_currentRow)
|
|
||||||
flags |= wxCONTROL_CURRENT;
|
|
||||||
if (m_hasFocus)
|
|
||||||
flags |= wxCONTROL_FOCUSED;
|
|
||||||
|
|
||||||
wxRect rect( x_start, item*m_lineHeight, x_last, m_lineHeight );
|
|
||||||
wxRendererNative::Get().DrawItemSelectionRect
|
|
||||||
(
|
|
||||||
this,
|
|
||||||
dc,
|
|
||||||
rect,
|
|
||||||
flags
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
wxDataViewColumn *expander = GetOwner()->GetExpanderColumn();
|
|
||||||
if (!expander)
|
|
||||||
{
|
|
||||||
// TODO: last column for RTL support
|
|
||||||
expander = GetOwner()->GetColumn( 0 );
|
|
||||||
GetOwner()->SetExpanderColumn(expander);
|
|
||||||
}
|
|
||||||
|
|
||||||
// redraw all cells for all rows which must be repainted and for all columns
|
|
||||||
wxRect cell_rect;
|
|
||||||
cell_rect.x = x_start;
|
|
||||||
cell_rect.height = m_lineHeight; // -1 is for the horizontal rules
|
|
||||||
for (unsigned int i = col_start; i < col_last; i++)
|
|
||||||
{
|
|
||||||
wxDataViewColumn *col = GetOwner()->GetColumn( i );
|
|
||||||
wxDataViewRenderer *cell = col->GetRenderer();
|
|
||||||
cell_rect.width = col->GetWidth();
|
|
||||||
|
|
||||||
if (col->IsHidden())
|
|
||||||
continue; // skipt it!
|
|
||||||
|
|
||||||
|
|
||||||
for (unsigned int item = item_start; item < item_last; item++)
|
|
||||||
{
|
|
||||||
// get the cell value and set it into the renderer
|
|
||||||
wxVariant value;
|
|
||||||
wxDataViewTreeNode *node = NULL;
|
|
||||||
wxDataViewItem dataitem;
|
|
||||||
|
|
||||||
if (m_root)
|
|
||||||
{
|
|
||||||
node = GetTreeNodeByRow(item);
|
|
||||||
if( node == NULL )
|
|
||||||
continue;
|
|
||||||
|
|
||||||
dataitem = node->GetItem();
|
|
||||||
|
|
||||||
if ((i > 0) && model->IsContainer(dataitem) && !model->HasContainerColumns(dataitem))
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
dataitem = wxDataViewItem( (void*) item );
|
|
||||||
}
|
|
||||||
|
|
||||||
model->GetValue( value, dataitem, col->GetModelColumn());
|
|
||||||
cell->SetValue( value );
|
|
||||||
|
|
||||||
if (cell->GetWantsAttr())
|
|
||||||
{
|
|
||||||
wxDataViewItemAttr attr;
|
|
||||||
bool ret = model->GetAttr( dataitem, col->GetModelColumn(), attr );
|
|
||||||
if (ret)
|
|
||||||
cell->SetAttr( attr );
|
|
||||||
cell->SetHasAttr( ret );
|
|
||||||
}
|
|
||||||
|
|
||||||
// update the y offset
|
|
||||||
cell_rect.y = item * m_lineHeight;
|
|
||||||
|
|
||||||
//Draw the expander here.
|
|
||||||
int indent = 0;
|
|
||||||
if ((m_root) && (col == expander))
|
|
||||||
{
|
|
||||||
indent = node->GetIndentLevel();
|
|
||||||
|
|
||||||
//Calculate the indent first
|
|
||||||
indent = cell_rect.x + GetOwner()->GetIndent() * indent;
|
|
||||||
|
|
||||||
int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
|
|
||||||
// change the cell_rect.x to the appropriate pos
|
|
||||||
int expander_x = indent + EXPANDER_MARGIN , expander_y = cell_rect.y + EXPANDER_MARGIN ;
|
|
||||||
indent = indent + m_lineHeight ; //try to use the m_lineHeight as the expander space
|
|
||||||
dc.SetPen( m_penExpander );
|
|
||||||
dc.SetBrush( wxNullBrush );
|
|
||||||
if( node->HasChildren() )
|
|
||||||
{
|
|
||||||
wxRect rect( expander_x , expander_y, expander_width, expander_width);
|
|
||||||
int flag = 0;
|
|
||||||
if (m_underMouse == node)
|
|
||||||
{
|
|
||||||
flag |= wxCONTROL_CURRENT;
|
|
||||||
}
|
|
||||||
if( node->IsOpen() )
|
|
||||||
wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag|wxCONTROL_EXPANDED );
|
|
||||||
else
|
|
||||||
wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
// I am wondering whether we should draw dot lines between tree nodes
|
|
||||||
if (node)
|
|
||||||
delete node;
|
|
||||||
// Yes, if the node does not have any child, it must be a leaf which
|
|
||||||
// mean that it is a temporarily created by GetTreeNodeByRow
|
|
||||||
}
|
|
||||||
|
|
||||||
//force the expander column to left-center align
|
|
||||||
cell->SetAlignment( wxALIGN_CENTER_VERTICAL );
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// cannot be bigger than allocated space
|
|
||||||
wxSize size = cell->GetSize();
|
|
||||||
// Because of the tree structure indent, here we should minus the width of the cell for drawing
|
|
||||||
size.x = wxMin( size.x + 2*PADDING_RIGHTLEFT, cell_rect.width - indent );
|
|
||||||
// size.y = wxMin( size.y, cell_rect.height );
|
|
||||||
size.y = cell_rect.height;
|
|
||||||
|
|
||||||
wxRect item_rect(cell_rect.GetTopLeft(), size);
|
|
||||||
int align = cell->GetAlignment();
|
|
||||||
|
|
||||||
// horizontal alignment:
|
|
||||||
item_rect.x = cell_rect.x;
|
|
||||||
if (align & wxALIGN_CENTER_HORIZONTAL)
|
|
||||||
item_rect.x = cell_rect.x + (cell_rect.width / 2) - (size.x / 2);
|
|
||||||
else if (align & wxALIGN_RIGHT)
|
|
||||||
item_rect.x = cell_rect.x + cell_rect.width - size.x;
|
|
||||||
//else: wxALIGN_LEFT is the default
|
|
||||||
|
|
||||||
// vertical alignment:
|
|
||||||
item_rect.y = cell_rect.y;
|
|
||||||
if (align & wxALIGN_CENTER_VERTICAL)
|
|
||||||
item_rect.y = cell_rect.y + (cell_rect.height / 2) - (size.y / 2);
|
|
||||||
else if (align & wxALIGN_BOTTOM)
|
|
||||||
item_rect.y = cell_rect.y + cell_rect.height - size.y;
|
|
||||||
//else: wxALIGN_TOP is the default
|
|
||||||
|
|
||||||
// add padding
|
|
||||||
item_rect.x += PADDING_RIGHTLEFT;
|
|
||||||
item_rect.width = size.x - 2 * PADDING_RIGHTLEFT;
|
|
||||||
|
|
||||||
//Here we add the tree indent
|
|
||||||
item_rect.x += indent;
|
|
||||||
|
|
||||||
int state = 0;
|
|
||||||
if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
|
|
||||||
state |= wxDATAVIEW_CELL_SELECTED;
|
|
||||||
|
|
||||||
// TODO: it would be much more efficient to create a clipping
|
|
||||||
// region for the entire column being rendered (in the OnPaint
|
|
||||||
// of wxDataViewMainWindow) instead of a single clip region for
|
|
||||||
// each cell. However it would mean that each renderer should
|
|
||||||
// respect the given wxRect's top & bottom coords, eventually
|
|
||||||
// violating only the left & right coords - however the user can
|
|
||||||
// make its own renderer and thus we cannot be sure of that.
|
|
||||||
dc.SetClippingRegion( item_rect );
|
|
||||||
cell->Render( item_rect, &dc, state );
|
|
||||||
dc.DestroyClippingRegion();
|
|
||||||
}
|
|
||||||
|
|
||||||
cell_rect.x += cell_rect.width;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
int wxDataViewMainWindow::GetCountPerPage() const
|
int wxDataViewMainWindow::GetCountPerPage() const
|
||||||
{
|
{
|
||||||
wxSize size = GetClientSize();
|
wxSize size = GetClientSize();
|
||||||
|
|||||||
Reference in New Issue
Block a user