#include "wx/imaglist.h"
#include "wx/headerctrl.h"
#include "wx/dnd.h"
+#include "wx/stopwatch.h"
//-----------------------------------------------------------------------------
// classes
//-----------------------------------------------------------------------------
+class wxDataViewColumn;
+class wxDataViewHeaderWindow;
class wxDataViewCtrl;
+//-----------------------------------------------------------------------------
+// classes
+//-----------------------------------------------------------------------------
+
static const int SCROLL_UNIT_X = 15;
// the cell padding on the left/right
static int g_column = -2;
static bool g_asending = true;
+//-----------------------------------------------------------------------------
+// wxDataViewColumn
+//-----------------------------------------------------------------------------
+
+void wxDataViewColumn::Init(int width, wxAlignment align, int flags)
+{
+ m_width = width;
+ m_minWidth = 0;
+ m_align = align;
+ m_flags = flags;
+ m_sort = false;
+ m_sortAscending = true;
+}
+
+int wxDataViewColumn::GetWidth() const
+{
+ switch ( m_width )
+ {
+ case wxCOL_WIDTH_DEFAULT:
+ return wxDVC_DEFAULT_WIDTH;
+
+ case wxCOL_WIDTH_AUTOSIZE:
+ wxCHECK_MSG( m_owner, wxDVC_DEFAULT_WIDTH, "no owner control" );
+ return m_owner->GetBestColumnWidth(m_owner->GetColumnIndex(this));
+
+ default:
+ return m_width;
+ }
+}
+
+void wxDataViewColumn::UpdateDisplay()
+{
+ if (m_owner)
+ {
+ int idx = m_owner->GetColumnIndex( this );
+ m_owner->OnColumnChange( idx );
+ }
+}
+
//-----------------------------------------------------------------------------
// wxDataViewHeaderWindow
//-----------------------------------------------------------------------------
return *(GetOwner()->GetColumn(idx));
}
- // FIXME: currently unused
virtual bool UpdateColumnWidthToFit(unsigned int idx, int widthTitle)
{
wxDataViewCtrl * const owner = GetOwner();
const wxString &name = wxT("wxdataviewctrlmainwindow") );
virtual ~wxDataViewMainWindow();
+ bool IsList() const { return GetOwner()->GetModel()->IsListModel(); }
bool IsVirtualList() const { return m_root == NULL; }
// notifications from wxDataViewModel
bool ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item );
bool ItemDeleted( const wxDataViewItem &parent, const wxDataViewItem &item );
bool ItemChanged( const wxDataViewItem &item );
- bool ValueChanged( const wxDataViewItem &item, unsigned int col );
+ bool ValueChanged( const wxDataViewItem &item, unsigned int model_column );
bool Cleared();
void Resort()
{
void ScrollWindow( int dx, int dy, const wxRect *rect = NULL );
void ScrollTo( int rows, int column );
+ unsigned GetCurrentRow() const { return m_currentRow; }
bool HasCurrentRow() { return m_currentRow != (unsigned int)-1; }
void ChangeCurrentRow( unsigned int row );
return true;
}
-wxControl* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
+wxWindow* wxDataViewTextRenderer::CreateEditorCtrl( wxWindow *parent,
wxRect labelRect, const wxVariant &value )
{
wxTextCtrl* ctrl = new wxTextCtrl( parent, wxID_ANY, value,
return ctrl;
}
-bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant &value )
+bool wxDataViewTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant &value )
{
wxTextCtrl *text = (wxTextCtrl*) editor;
value = text->GetValue();
wxSize wxDataViewTextRenderer::GetSize() const
{
- const wxDataViewCtrl *view = GetView();
if (!m_text.empty())
- return view->wxWindowBase::GetTextExtent( m_text );
- return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE);
+ return GetTextExtent(m_text);
+ else
+ return wxSize(wxDVC_DEFAULT_RENDERER_SIZE,wxDVC_DEFAULT_RENDERER_SIZE);
}
// ---------------------------------------------------------
int flags = 0;
if (m_toggle)
flags |= wxCONTROL_CHECKED;
- if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE)
+ if (GetMode() != wxDATAVIEW_CELL_ACTIVATABLE ||
+ GetEnabled() == false)
flags |= wxCONTROL_DISABLED;
+ // check boxes we draw must always have the same, standard size (if it's
+ // bigger than the cell size the checkbox will be truncated because the
+ // caller had set the clipping rectangle to prevent us from drawing outside
+ // the cell)
+ cell.SetSize(GetSize());
+
wxRendererNative::Get().DrawCheckBox(
GetOwner()->GetOwner(),
*dc,
return true;
}
-bool wxDataViewToggleRenderer::Activate( wxRect WXUNUSED(cell),
- wxDataViewModel *model,
- const wxDataViewItem & item, unsigned int col)
+bool wxDataViewToggleRenderer::WXOnLeftClick(const wxPoint& cursor,
+ const wxRect& WXUNUSED(cell),
+ wxDataViewModel *model,
+ const wxDataViewItem& item,
+ unsigned int col)
{
- model->ChangeValue(!m_toggle, item, col);
- return true;
+ // only react to clicks directly on the checkbox, not elsewhere in the same cell:
+ if (!wxRect(GetSize()).Contains(cursor))
+ return false;
+
+ if (model->IsEnabled(item, col))
+ {
+ model->ChangeValue(!m_toggle, item, col);
+ return true;
+ }
+
+ return false;
}
wxSize wxDataViewToggleRenderer::GetSize() const
wxSize wxDataViewDateRenderer::GetSize() const
{
- const wxDataViewCtrl* view = GetView();
- wxString tmp = m_date.FormatDate();
- wxCoord x,y,d;
- view->GetTextExtent( tmp, &x, &y, &d );
- return wxSize(x,y+d);
+ return GetTextExtent(m_date.FormatDate());
}
-bool wxDataViewDateRenderer::Activate( wxRect WXUNUSED(cell), wxDataViewModel *model,
- const wxDataViewItem & item, unsigned int col )
+bool wxDataViewDateRenderer::WXOnActivate(const wxRect& WXUNUSED(cell),
+ wxDataViewModel *model,
+ const wxDataViewItem& item,
+ unsigned int col)
{
- wxVariant variant;
- model->GetValue( variant, item, col );
- wxDateTime value = variant.GetDateTime();
+ wxDateTime dtOld = m_date;
#if wxUSE_DATE_RENDERER_POPUP
wxDataViewDateRendererPopupTransient *popup = new wxDataViewDateRendererPopupTransient(
- GetOwner()->GetOwner()->GetParent(), &value, model, item, col);
+ GetOwner()->GetOwner()->GetParent(), &dtOld, model, item, col);
wxPoint pos = wxGetMousePosition();
popup->Move( pos );
popup->Layout();
popup->Popup( popup->m_cal );
#else // !wxUSE_DATE_RENDERER_POPUP
- wxMessageBox(value.Format());
+ wxMessageBox(dtOld.Format());
#endif // wxUSE_DATE_RENDERER_POPUP/!wxUSE_DATE_RENDERER_POPUP
+
return true;
}
wxSize wxDataViewIconTextRenderer::GetSize() const
{
- const wxDataViewCtrl *view = GetView();
if (!m_value.GetText().empty())
{
- int x,y;
- view->GetTextExtent( m_value.GetText(), &x, &y );
+ wxSize size = GetTextExtent(m_value.GetText());
if (m_value.GetIcon().IsOk())
- x += m_value.GetIcon().GetWidth() + 4;
- return wxSize( x, y );
+ size.x += m_value.GetIcon().GetWidth() + 4;
+ return size;
}
return wxSize(80,20);
}
-wxControl* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value)
+wxWindow* wxDataViewIconTextRenderer::CreateEditorCtrl(wxWindow *parent, wxRect labelRect, const wxVariant& value)
{
wxDataViewIconText iconText;
iconText << value;
return ctrl;
}
-bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxControl *editor, wxVariant& value )
+bool wxDataViewIconTextRenderer::GetValueFromEditorCtrl( wxWindow *editor, wxVariant& value )
{
wxTextCtrl *text = (wxTextCtrl*) editor;
//-----------------------------------------------------------------------------
// The tree building helper, declared firstly
-static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item,
+static void BuildTreeHelper( const wxDataViewModel * model, const wxDataViewItem & item,
wxDataViewTreeNode * node);
int LINKAGEMODE wxDataViewSelectionCmp( unsigned int row1, unsigned int row2 )
m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
unsigned int row = GetLineAt( yy );
- if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
+ if ((row >= GetRowCount()) || (xx > GetEndOfLastCol()))
{
RemoveDropHint();
return wxDragNone;
m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
unsigned int row = GetLineAt( yy );
- if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
+ if ((row >= GetRowCount()) || (xx > GetEndOfLastCol()))
return false;
wxDataViewItem item = GetItemByRow( row );
m_owner->CalcUnscrolledPosition( xx, yy, &xx, &yy );
unsigned int row = GetLineAt( yy );
- if ((row >= GetRowCount()) || (yy > GetEndOfLastCol()))
+ if ((row >= GetRowCount()) || (xx > GetEndOfLastCol()))
return wxDragNone;
wxDataViewItem item = GetItemByRow( row );
}
indent = 0;
- if (!IsVirtualList())
+ if (!IsList())
{
wxDataViewTreeNode *node = GetTreeNodeByRow(row);
indent = GetOwner()->GetIndent() * node->GetIndentLevel();
if (column == expander)
width -= indent;
- wxVariant value;
wxDataViewItem item = GetItemByRow( row );
- model->GetValue( value, item, column->GetModelColumn());
- cell->SetValue( value );
-
- wxDataViewItemAttr attr;
- model->GetAttr(item, column->GetModelColumn(), attr);
- cell->SetAttr(attr);
+ cell->PrepareForItem(model, item, column->GetModelColumn());
wxRect item_rect(x, 0, width, height);
item_rect.Deflate(PADDING_RIGHTLEFT, 0);
dc.DrawRectangle(GetClientSize());
#endif
+ if ( IsEmpty() )
+ {
+ // No items to draw.
+ return;
+ }
+
// prepare the DC
GetOwner()->PrepareDC( dc );
dc.SetFont( GetFont() );
wxMin( (int)( GetLineAt( wxMax(0,update.y+update.height) ) - item_start + 1),
(int)(GetRowCount( ) - item_start));
unsigned int item_last = item_start + item_count;
- // Get the parent of DataViewCtrl
- wxWindow *parent = GetParent()->GetParent();
+
+ // Send the event to wxDataViewCtrl itself.
+ wxWindow * const parent = GetParent();
wxDataViewEvent cache_event(wxEVT_COMMAND_DATAVIEW_CACHE_HINT, parent->GetId());
- cache_event.SetEventObject(GetParent());
+ cache_event.SetEventObject(parent);
cache_event.SetCache(item_start, item_last - 1);
parent->ProcessWindowEvent(cache_event);
// compute which columns needs to be redrawn
unsigned int cols = GetOwner()->GetColumnCount();
+ if ( !cols )
+ {
+ // we assume that we have at least one column below and painting an
+ // empty control is unnecessary anyhow
+ return;
+ }
+
unsigned int col_start = 0;
unsigned int x_start;
for (x_start = 0; col_start < cols; col_start++)
dc.SetPen(m_penRule);
dc.SetBrush(*wxTRANSPARENT_BRUSH);
- int x = x_start;
+ // NB: Vertical rules are drawn in the last pixel of a column so that
+ // they align perfectly with native MSW wxHeaderCtrl as well as for
+ // consistency with MSW native list control. There's no vertical
+ // rule at the most-left side of the control.
+
+ int x = x_start - 1;
for (unsigned int i = col_start; i < col_last; i++)
{
wxDataViewColumn *col = GetOwner()->GetColumnAt(i);
if (col->IsHidden())
continue; // skip it
+ x += col->GetWidth();
+
dc.DrawLine(x, GetLineStart( item_start ),
x, GetLineStart( item_last ) );
-
- x += col->GetWidth();
}
-
- // Draw last vertical rule
- dc.DrawLine(x, GetLineStart( item_start ),
- x, GetLineStart( item_last ) );
}
// redraw the background for the items which are selected/current
if (m_hasFocus)
flags |= wxCONTROL_FOCUSED;
- wxRect rect( x_start, GetLineStart( item ), x_last, GetLineHeight( item ) );
+ wxRect rect( x_start, GetLineStart( item ),
+ x_last - x_start, GetLineHeight( item ) );
wxRendererNative::Get().DrawItemSelectionRect
(
this,
if (m_dropHint)
{
wxRect rect( x_start, GetLineStart( m_dropHintLine ),
- x_last, GetLineHeight( m_dropHintLine ) );
+ x_last - x_start, GetLineHeight( m_dropHintLine ) );
dc.SetPen( *wxBLACK_PEN );
dc.SetBrush( *wxTRANSPARENT_BRUSH );
dc.DrawRectangle( rect );
wxDataViewRenderer *cell = col->GetRenderer();
cell_rect.width = col->GetWidth();
- if (col->IsHidden())
+ if ( col->IsHidden() || cell_rect.width <= 0 )
continue; // skip 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;
dataitem = wxDataViewItem( wxUIntToPtr(item+1) );
}
- model->GetValue( value, dataitem, col->GetModelColumn());
- cell->SetValue( value );
-
- wxDataViewItemAttr attr;
- model->GetAttr(dataitem, col->GetModelColumn(), attr);
- cell->SetAttr(attr);
+ cell->PrepareForItem(model, dataitem, col->GetModelColumn());
// update cell_rect
cell_rect.y = GetLineStart( item );
cell_rect.height = GetLineHeight( item );
- // Draw the expander here.
+ // deal with the expander
int indent = 0;
- if ((!IsVirtualList()) && (col == expander))
+ if ((!IsList()) && (col == expander))
{
- indent = node->GetIndentLevel();
-
// Calculate the indent first
- indent = cell_rect.x + GetOwner()->GetIndent() * indent;
-
- int expander_width = m_lineHeight - 2*EXPANDER_MARGIN;
+ indent = GetOwner()->GetIndent() * node->GetIndentLevel();
- // change the cell_rect.x to the appropriate pos
- int expander_x = indent + EXPANDER_MARGIN;
- int expander_y = cell_rect.y + EXPANDER_MARGIN + (GetLineHeight(item) / 2)
- - (expander_width/2) - EXPANDER_OFFSET;
+ // we reserve m_lineHeight of horizontal space for the expander
+ // but leave EXPANDER_MARGIN around the expander itself
+ int exp_x = cell_rect.x + indent + EXPANDER_MARGIN;
- indent = indent + m_lineHeight;
- // try to use the m_lineHeight as the expander space
+ indent += m_lineHeight;
- dc.SetPen( m_penExpander );
- dc.SetBrush( wxNullBrush );
- if( node->HasChildren() )
+ // draw expander if needed and visible
+ if ( node->HasChildren() && exp_x < cell_rect.GetRight() )
{
- wxRect rect( expander_x , expander_y, expander_width, expander_width);
+ dc.SetPen( m_penExpander );
+ dc.SetBrush( wxNullBrush );
+
+ int exp_size = m_lineHeight - 2*EXPANDER_MARGIN;
+ int exp_y = cell_rect.y + (cell_rect.height - exp_size)/2
+ + EXPANDER_MARGIN - EXPANDER_OFFSET;
+
+ const wxRect rect(exp_x, exp_y, exp_size, exp_size);
+
int flag = 0;
- if (m_underMouse == node)
- {
+ 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);
+ if ( node->IsOpen() )
+ flag |= wxCONTROL_EXPANDED;
+
+ // ensure that we don't overflow the cell (which might
+ // happen if the column is very narrow)
+ wxDCClipper clip(dc, cell_rect);
+
+ wxRendererNative::Get().DrawTreeItemButton( this, dc, rect, flag);
}
// force the expander column to left-center align
item_rect.x += indent;
item_rect.width -= indent;
+ if ( item_rect.width <= 0 )
+ continue;
+
int state = 0;
if (m_hasFocus && (m_selection.Index(item) != wxNOT_FOUND))
state |= wxDATAVIEW_CELL_SELECTED;
;
}
- wxDataViewTreeNodes nodes = node->GetNodes();
- wxDataViewTreeLeaves leaves = node->GetChildren();
+ const wxDataViewTreeNodes& nodes = node->GetNodes();
+ const wxDataViewTreeLeaves& leaves = node->GetChildren();
int len_nodes = nodes.GetCount();
int len = leaves.GetCount();
bool wxDataViewMainWindow::ItemAdded(const wxDataViewItem & parent, const wxDataViewItem & item)
{
+ GetOwner()->InvalidateColBestWidths();
+
if (IsVirtualList())
{
wxDataViewVirtualListModel *list_model =
bool wxDataViewMainWindow::ItemDeleted(const wxDataViewItem& parent,
const wxDataViewItem& item)
{
+ GetOwner()->InvalidateColBestWidths();
+
if (IsVirtualList())
{
wxDataViewVirtualListModel *list_model =
wxDataViewTreeNode * node = FindNode(parent);
- wxCHECK_MSG( node != NULL, false, "item not found" );
- wxCHECK_MSG( node->GetChildren().Index( item.GetID() ) != wxNOT_FOUND,
- false, "item not found" );
+ // Notice that it is possible that the item being deleted is not in the
+ // tree at all, for example we could be deleting a never shown (because
+ // collapsed) item in a tree model. So it's not an error if we don't know
+ // about this item, just return without doing anything then.
+ if ( !node || node->GetChildren().Index(item.GetID()) == wxNOT_FOUND )
+ return false;
int sub = -1;
node->GetChildren().Remove( item.GetID() );
bool wxDataViewMainWindow::ItemChanged(const wxDataViewItem & item)
{
+ GetOwner()->InvalidateColBestWidths();
+
SortPrepare();
g_model->Resort();
return true;
}
-bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int col )
+bool wxDataViewMainWindow::ValueChanged( const wxDataViewItem & item, unsigned int model_column )
{
+ int view_column = -1;
+ unsigned int n_col = m_owner->GetColumnCount();
+ for (unsigned i = 0; i < n_col; i++)
+ {
+ wxDataViewColumn *column = m_owner->GetColumn( i );
+ if (column->GetModelColumn() == model_column)
+ {
+ view_column = (int) i;
+ break;
+ }
+ }
+ if (view_column == -1)
+ return false;
+
+ GetOwner()->InvalidateColBestWidth(view_column);
+
// NOTE: to be valid, we cannot use e.g. INT_MAX - 1
/*#define MAX_VIRTUAL_WIDTH 100000
le.SetEventObject(parent);
le.SetModel(GetOwner()->GetModel());
le.SetItem(item);
- le.SetColumn(col);
- le.SetDataViewColumn(GetOwner()->GetColumn(col));
+ le.SetColumn(view_column);
+ le.SetDataViewColumn(GetOwner()->GetColumn(view_column));
parent->GetEventHandler()->ProcessEvent(le);
return true;
bool wxDataViewMainWindow::Cleared()
{
+ GetOwner()->InvalidateColBestWidths();
+
DestroyTree();
+ m_selection.Clear();
SortPrepare();
BuildTree( GetOwner()->GetModel() );
void wxDataViewMainWindow::ScrollWindow( int dx, int dy, const wxRect *rect )
{
+ m_underMouse = NULL;
+
wxWindow::ScrollWindow( dx, dy, rect );
if (GetOwner()->m_headerArea)
void wxDataViewMainWindow::ScrollTo( int rows, int column )
{
+ m_underMouse = NULL;
+
int x, y;
m_owner->GetScrollPixelsPerUnit( &x, &y );
int sy = GetLineStart( rows )/y;
!model->HasContainerColumns(item))
continue; // skip it!
- wxVariant value;
- model->GetValue( value, item, column->GetModelColumn() );
-
wxDataViewRenderer *renderer =
const_cast<wxDataViewRenderer*>(column->GetRenderer());
- renderer->SetValue( value );
+ renderer->PrepareForItem(model, item, column->GetModelColumn());
+
height = wxMax( height, renderer->GetSize().y );
}
!model->HasContainerColumns(item))
continue; // skip it!
- wxVariant value;
- model->GetValue( value, item, column->GetModelColumn() );
-
wxDataViewRenderer *renderer =
const_cast<wxDataViewRenderer*>(column->GetRenderer());
- renderer->SetValue( value );
+ renderer->PrepareForItem(model, item, column->GetModelColumn());
+
height = wxMax( height, renderer->GetSize().y );
}
!model->HasContainerColumns(item))
continue; // skip it!
- wxVariant value;
- model->GetValue( value, item, column->GetModelColumn() );
-
wxDataViewRenderer *renderer =
const_cast<wxDataViewRenderer*>(column->GetRenderer());
- renderer->SetValue( value );
+ renderer->PrepareForItem(model, item, column->GetModelColumn());
+
height = wxMax( height, renderer->GetSize().y );
}
bool wxDataViewMainWindow::IsExpanded( unsigned int row ) const
{
- if (IsVirtualList())
+ if (IsList())
return false;
wxDataViewTreeNode * node = GetTreeNodeByRow(row);
bool wxDataViewMainWindow::HasChildren( unsigned int row ) const
{
- if (IsVirtualList())
+ if (IsList())
return false;
wxDataViewTreeNode * node = GetTreeNodeByRow(row);
void wxDataViewMainWindow::Expand( unsigned int row )
{
- if (IsVirtualList())
+ if (IsList())
return;
wxDataViewTreeNode * node = GetTreeNodeByRow(row);
void wxDataViewMainWindow::Collapse(unsigned int row)
{
- if (IsVirtualList())
+ if (IsList())
return;
wxDataViewTreeNode *node = GetTreeNodeByRow(row);
wxDataViewTreeNode * wxDataViewMainWindow::FindNode( const wxDataViewItem & item )
{
- wxDataViewModel * model = GetOwner()->GetModel();
+ const wxDataViewModel * model = GetOwner()->GetModel();
if( model == NULL )
return NULL;
if (!item.IsOk())
return m_root;
- // Compose the a parent-chain of the finding item
- ItemList list;
- list.DeleteContents( true );
+ // Compose the parent-chain for the item we are looking for
+ wxVector<wxDataViewItem> parentChain;
wxDataViewItem it( item );
while( it.IsOk() )
{
- wxDataViewItem * pItem = new wxDataViewItem( it );
- list.Insert( pItem );
- it = model->GetParent( it );
+ parentChain.push_back(it);
+ it = model->GetParent(it);
}
// Find the item along the parent-chain.
// This algorithm is designed to speed up the node-finding method
- wxDataViewTreeNode * node = m_root;
- for( ItemList::const_iterator iter = list.begin(); iter !=list.end(); iter++ )
+ wxDataViewTreeNode* node = m_root;
+ for( unsigned iter = parentChain.size()-1; iter>=0; --iter )
{
if( node->HasChildren() )
{
::BuildTreeHelper(model, node->GetItem(), node);
}
- wxDataViewTreeNodes nodes = node->GetNodes();
- unsigned int i;
+ const wxDataViewTreeNodes& nodes = node->GetNodes();
bool found = false;
- for (i = 0; i < nodes.GetCount(); i ++)
+ for (unsigned i = 0; i < nodes.GetCount(); ++i)
{
- if (nodes[i]->GetItem() == (**iter))
+ wxDataViewTreeNode* currentNode = nodes[i];
+ if (currentNode->GetItem() == parentChain[iter])
{
- if (nodes[i]->GetItem() == item)
- return nodes[i];
+ if (currentNode->GetItem() == item)
+ return currentNode;
- node = nodes[i];
+ node = currentNode;
found = true;
break;
}
// to get the correct x position where the actual text is
int indent = 0;
int row = GetRowByItem(item);
- if (!IsVirtualList() && (column == 0 || GetOwner()->GetExpanderColumn() == column) )
+ if (!IsList() && (column == 0 || GetOwner()->GetExpanderColumn() == column) )
{
wxDataViewTreeNode* node = GetTreeNodeByRow(row);
indent = GetOwner()->GetIndent() * node->GetIndentLevel();
class ItemToRowJob : public DoJob
{
public:
- ItemToRowJob(const wxDataViewItem& item_, ItemList::const_iterator iter)
+ ItemToRowJob(const wxDataViewItem& item_, wxVector<wxDataViewItem>::reverse_iterator iter)
: m_iter(iter),
item(item_)
{
return DoJob::OK;
}
- if( node->GetItem() == **m_iter )
+ if( node->GetItem() == *m_iter )
{
m_iter++;
return DoJob::CONT;
{ return ret -1; }
private:
- ItemList::const_iterator m_iter;
+ wxVector<wxDataViewItem>::reverse_iterator m_iter;
wxDataViewItem item;
int ret;
if( !item.IsOk() )
return -1;
- // Compose the a parent-chain of the finding item
- ItemList list;
- wxDataViewItem * pItem;
- list.DeleteContents( true );
+ // Compose the parent-chain of the item we are looking for
+ wxVector<wxDataViewItem> parentChain;
wxDataViewItem it( item );
while( it.IsOk() )
{
- pItem = new wxDataViewItem( it );
- list.Insert( pItem );
- it = model->GetParent( it );
+ parentChain.push_back(it);
+ it = model->GetParent(it);
}
- pItem = new wxDataViewItem( );
- list.Insert( pItem );
- ItemToRowJob job( item, list.begin() );
- Walker(m_root , job );
+ // add an 'invalid' item to represent our 'invisible' root node
+ parentChain.push_back(wxDataViewItem());
+
+ // the parent chain was created by adding the deepest parent first.
+ // so if we want to start at the root node, we have to iterate backwards through the vector
+ ItemToRowJob job( item, parentChain.rbegin() );
+ Walker( m_root, job );
return job.GetResult();
}
}
-static void BuildTreeHelper( wxDataViewModel * model, wxDataViewItem & item,
+static void BuildTreeHelper( const wxDataViewModel * model, const wxDataViewItem & item,
wxDataViewTreeNode * node)
{
if( !model->IsContainer( item ) )
void wxDataViewMainWindow::OnChar( wxKeyEvent &event )
{
- if ( GetParent()->HandleAsNavigationKey(event) )
+ wxWindow * const parent = GetParent();
+
+ // propagate the char event upwards
+ wxKeyEvent eventForParent(event);
+ eventForParent.SetEventObject(parent);
+ if ( parent->ProcessWindowEvent(eventForParent) )
+ return;
+
+ if ( parent->HandleAsNavigationKey(event) )
return;
// no item -> nothing to do
{
case WXK_RETURN:
{
- wxWindow *parent = GetParent();
wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED,
parent->GetId());
le.SetItem( GetItemByRow(m_currentRow) );
// Add the process for tree expanding/collapsing
case WXK_LEFT:
{
- if (IsVirtualList())
+ if (IsList())
break;
wxDataViewTreeNode* node = GetTreeNodeByRow(m_currentRow);
return;
}
+ // set the focus to ourself if any of the mouse buttons are pressed
+ if(event.ButtonDown() && !HasFocus())
+ SetFocus();
+
int x = event.GetX();
int y = event.GetY();
m_owner->CalcUnscrolledPosition( x, y, &x, &y );
xpos += c->GetWidth();
}
if (!col)
+ {
+ event.Skip();
return;
+ }
wxDataViewRenderer *cell = col->GetRenderer();
unsigned int current = GetLineAt( y );
if ((current >= GetRowCount()) || (x > GetEndOfLastCol()))
{
// Unselect all if below the last row ?
+ event.Skip();
return;
}
// Test whether the mouse is hovered on the tree item button
bool hoverOverExpander = false;
- if ((!IsVirtualList()) && (GetOwner()->GetExpanderColumn() == col))
+ if ((!IsList()) && (GetOwner()->GetExpanderColumn() == col))
{
wxDataViewTreeNode * node = GetTreeNodeByRow(current);
if( node!=NULL && node->HasChildren() )
{
if ((!ignore_other_columns) && (cell->GetMode() == wxDATAVIEW_CELL_ACTIVATABLE))
{
- if ( wxDataViewCustomRenderer *custom = cell->WXGetAsCustom() )
- {
- wxVariant value;
- model->GetValue( value, item, col->GetModelColumn() );
- custom->SetValue( value );
- wxRect cell_rect( xpos, GetLineStart( current ),
- col->GetWidth(), GetLineHeight( current ) );
- custom->Activate( cell_rect, model, item, col->GetModelColumn() );
- }
+ const unsigned colIdx = col->GetModelColumn();
+
+ cell->PrepareForItem(model, item, colIdx);
+
+ wxRect cell_rect( xpos, GetLineStart( current ),
+ col->GetWidth(), GetLineHeight( current ) );
+ cell->WXOnActivate( cell_rect, model, item, colIdx );
}
else
{
wxWindow *parent = GetParent();
wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_ACTIVATED, parent->GetId());
le.SetItem( item );
+ le.SetColumn( col->GetModelColumn() );
+ le.SetDataViewColumn( col );
le.SetEventObject(parent);
le.SetModel(GetOwner()->GetModel());
wxWindow *parent = GetParent();
wxDataViewEvent le(wxEVT_COMMAND_DATAVIEW_ITEM_CONTEXT_MENU, parent->GetId());
le.SetItem( item );
+ le.SetColumn( col->GetModelColumn() );
+ le.SetDataViewColumn( col );
le.SetEventObject(parent);
le.SetModel(GetOwner()->GetModel());
le.SetValue(value);
}
else if ((event.LeftDown() || simulateClick) && !hoverOverExpander)
{
- SetFocus();
-
m_lineBeforeLastClicked = m_lineLastClicked;
m_lineLastClicked = current;
{
ChangeCurrentRow(current);
ReverseRowSelection(m_currentRow);
- SendSelectionChangedEvent(GetItemByRow(m_selection[0]) );
+ SendSelectionChangedEvent(GetItemByRow(m_currentRow));
}
else if (event.ShiftDown())
{
// Call LeftClick after everything else as under GTK+
if (cell->GetMode() & wxDATAVIEW_CELL_ACTIVATABLE)
{
- if ( wxDataViewCustomRenderer *custom = cell->WXGetAsCustom() )
+ // notify cell about click
+ cell->PrepareForItem(model, item, col->GetModelColumn());
+
+ wxRect cell_rect( xpos, GetLineStart( current ),
+ col->GetWidth(), GetLineHeight( current ) );
+
+ // Report position relative to the cell's custom area, i.e.
+ // no the entire space as given by the control but the one
+ // used by the renderer after calculation of alignment etc.
+
+ // adjust the rectangle ourselves to account for the alignment
+ wxRect rectItem = cell_rect;
+ const int align = cell->GetAlignment();
+ if ( align != wxDVR_DEFAULT_ALIGNMENT )
{
- // notify cell about click
- wxVariant value;
- model->GetValue( value, item, col->GetModelColumn() );
- custom->SetValue( value );
- wxRect cell_rect( xpos, GetLineStart( current ),
- col->GetWidth(), GetLineHeight( current ) );
- /* ignore ret */ custom->LeftClick( event.GetPosition(), cell_rect,
- model, item, col->GetModelColumn());
+ const wxSize size = cell->GetSize();
+
+ if ( size.x >= 0 && size.x < cell_rect.width )
+ {
+ if ( align & wxALIGN_CENTER_HORIZONTAL )
+ rectItem.x += (cell_rect.width - size.x)/2;
+ else if ( align & wxALIGN_RIGHT )
+ rectItem.x += cell_rect.width - size.x;
+ // else: wxALIGN_LEFT is the default
+ }
+
+ if ( size.y >= 0 && size.y < cell_rect.height )
+ {
+ if ( align & wxALIGN_CENTER_VERTICAL )
+ rectItem.y += (cell_rect.height - size.y)/2;
+ else if ( align & wxALIGN_BOTTOM )
+ rectItem.y += cell_rect.height - size.y;
+ // else: wxALIGN_TOP is the default
+ }
}
+
+ wxPoint pos( event.GetPosition() );
+ pos.x -= rectItem.x;
+ pos.y -= rectItem.y;
+
+ m_owner->CalcUnscrolledPosition( pos.x, pos.y, &pos.x, &pos.y );
+
+ /* ignore ret */ cell->WXOnLeftClick( pos, cell_rect,
+ model, item, col->GetModelColumn());
}
}
}
GetModel()->RemoveNotifier( m_notifier );
m_cols.Clear();
+ m_colsBestWidths.clear();
}
void wxDataViewCtrl::Init()
m_headerArea = NULL;
}
-bool wxDataViewCtrl::Create(wxWindow *parent, wxWindowID id,
- const wxPoint& pos, const wxSize& size,
- long style, const wxValidator& validator )
+bool wxDataViewCtrl::Create(wxWindow *parent,
+ wxWindowID id,
+ const wxPoint& pos,
+ const wxSize& size,
+ long style,
+ const wxValidator& validator,
+ const wxString& name)
{
// if ( (style & wxBORDER_MASK) == 0)
// style |= wxBORDER_SUNKEN;
Init();
if (!wxControl::Create( parent, id, pos, size,
- style | wxScrolledWindowStyle, validator))
+ style | wxScrolledWindowStyle, validator, name))
return false;
SetInitialSize(size);
m_clientArea = new wxDataViewMainWindow( this, wxID_ANY );
+ // We use the cursor keys for moving the selection, not scrolling, so call
+ // this method to ensure wxScrollHelperEvtHandler doesn't catch all
+ // keyboard events forwarded to us from wxListMainWindow.
+ DisableKeyboardScrolling();
+
if (HasFlag(wxDV_NO_HEADER))
m_headerArea = NULL;
else
return false;
m_cols.Append( col );
+ m_colsBestWidths.push_back(0);
OnColumnsCountChanged();
return true;
}
return false;
m_cols.Insert( col );
+ m_colsBestWidths.insert(m_colsBestWidths.begin(), 0);
OnColumnsCountChanged();
return true;
}
return false;
m_cols.Insert( pos, col );
+ m_colsBestWidths.insert(m_colsBestWidths.begin() + pos, 0);
OnColumnsCountChanged();
return true;
}
return wxNOT_FOUND;
}
+unsigned int wxDataViewCtrl::GetBestColumnWidth(int idx) const
+{
+ if ( m_colsBestWidths[idx] != 0 )
+ return m_colsBestWidths[idx];
+
+ const int count = m_clientArea->GetRowCount();
+ wxDataViewColumn *column = GetColumn(idx);
+ wxDataViewRenderer *renderer =
+ const_cast<wxDataViewRenderer*>(column->GetRenderer());
+
+ class MaxWidthCalculator
+ {
+ public:
+ MaxWidthCalculator(wxDataViewMainWindow *clientArea,
+ wxDataViewRenderer *renderer,
+ const wxDataViewModel *model,
+ unsigned column)
+ : m_width(0),
+ m_clientArea(clientArea),
+ m_renderer(renderer),
+ m_model(model),
+ m_column(column)
+ {
+ }
+
+ void UpdateWithWidth(int width)
+ {
+ m_width = wxMax(m_width, width);
+ }
+
+ void UpdateWithRow(int row)
+ {
+ wxDataViewItem item = m_clientArea->GetItemByRow(row);
+ m_renderer->PrepareForItem(m_model, item, m_column);
+ m_width = wxMax(m_width, m_renderer->GetSize().x);
+ }
+
+ int GetMaxWidth() const { return m_width; }
+
+ private:
+ int m_width;
+ wxDataViewMainWindow *m_clientArea;
+ wxDataViewRenderer *m_renderer;
+ const wxDataViewModel *m_model;
+ unsigned m_column;
+ };
+
+ MaxWidthCalculator calculator(m_clientArea, renderer,
+ GetModel(), column->GetModelColumn());
+
+ if ( m_headerArea )
+ {
+ int header_width = m_headerArea->GetTextExtent(column->GetTitle()).x;
+ // Labels on native MSW header are indented on both sides
+ header_width +=
+ wxRendererNative::Get().GetHeaderButtonMargin(m_headerArea);
+ calculator.UpdateWithWidth(header_width);
+ }
+
+ // The code below deserves some explanation. For very large controls, we
+ // simply can't afford to calculate sizes for all items, it takes too
+ // long. So the best we can do is to check the first and the last N/2
+ // items in the control for some sufficiently large N and calculate best
+ // sizes from that. That can result in the calculated best width being too
+ // small for some outliers, but it's better to get slightly imperfect
+ // result than to wait several seconds after every update. To avoid highly
+ // visible miscalculations, we also include all currently visible items
+ // no matter what. Finally, the value of N is determined dynamically by
+ // measuring how much time we spent on the determining item widths so far.
+
+#if wxUSE_STOPWATCH
+ int top_part_end = count;
+ static const long CALC_TIMEOUT = 20/*ms*/;
+ // don't call wxStopWatch::Time() too often
+ static const unsigned CALC_CHECK_FREQ = 100;
+ wxStopWatch timer;
+#else
+ // use some hard-coded limit, that's the best we can do without timer
+ int top_part_end = wxMin(500, count);
+#endif // wxUSE_STOPWATCH/!wxUSE_STOPWATCH
+
+ int row = 0;
+
+ for ( row = 0; row < top_part_end; row++ )
+ {
+#if wxUSE_STOPWATCH
+ if ( row % CALC_CHECK_FREQ == CALC_CHECK_FREQ-1 &&
+ timer.Time() > CALC_TIMEOUT )
+ break;
+#endif // wxUSE_STOPWATCH
+ calculator.UpdateWithRow(row);
+ }
+
+ // row is the first unmeasured item now; that's our value of N/2
+
+ if ( row < count )
+ {
+ top_part_end = row;
+
+ // add bottom N/2 items now:
+ const int bottom_part_start = wxMax(row, count - row);
+ for ( row = bottom_part_start; row < count; row++ )
+ {
+ calculator.UpdateWithRow(row);
+ }
+
+ // finally, include currently visible items in the calculation:
+ const wxPoint origin = CalcUnscrolledPosition(wxPoint(0, 0));
+ int first_visible = m_clientArea->GetLineAt(origin.y);
+ int last_visible = m_clientArea->GetLineAt(origin.y + GetClientSize().y);
+
+ first_visible = wxMax(first_visible, top_part_end);
+ last_visible = wxMin(bottom_part_start, last_visible);
+
+ for ( row = first_visible; row < last_visible; row++ )
+ {
+ calculator.UpdateWithRow(row);
+ }
+
+ wxLogTrace("dataview",
+ "determined best size from %d top, %d bottom plus %d more visible items out of %d total",
+ top_part_end,
+ count - bottom_part_start,
+ wxMax(0, last_visible - first_visible),
+ count);
+ }
+
+ int max_width = calculator.GetMaxWidth();
+ if ( max_width > 0 )
+ max_width += 2 * PADDING_RIGHTLEFT;
+
+ const_cast<wxDataViewCtrl*>(this)->m_colsBestWidths[idx] = max_width;
+ return max_width;
+}
+
void wxDataViewCtrl::ColumnMoved(wxDataViewColumn * WXUNUSED(col),
unsigned int WXUNUSED(new_pos))
{
if (!ret)
return false;
+ m_colsBestWidths.erase(m_colsBestWidths.begin() + GetColumnIndex(column));
m_cols.Erase(ret);
OnColumnsCountChanged();
bool wxDataViewCtrl::ClearColumns()
{
m_cols.Clear();
+ m_colsBestWidths.clear();
OnColumnsCountChanged();
return true;
}
+void wxDataViewCtrl::InvalidateColBestWidth(int idx)
+{
+ m_colsBestWidths[idx] = 0;
+
+ if ( m_headerArea )
+ m_headerArea->UpdateColumn(idx);
+}
+
+void wxDataViewCtrl::InvalidateColBestWidths()
+{
+ m_colsBestWidths.clear();
+ m_colsBestWidths.resize(m_cols.size());
+
+ if ( m_headerArea )
+ {
+ const unsigned cols = m_headerArea->GetColumnCount();
+ for ( unsigned i = 0; i < cols; i++ )
+ m_headerArea->UpdateColumn(i);
+ }
+}
+
int wxDataViewCtrl::GetColumnPosition( const wxDataViewColumn *column ) const
{
+#if 1
+ unsigned int len = GetColumnCount();
+ for ( unsigned int i = 0; i < len; i++ )
+ {
+ wxDataViewColumn * col = GetColumnAt(i);
+ if (column==col)
+ return i;
+ }
+
+ return wxNOT_FOUND;
+#else
+ // This returns the position in pixels which is not what we want.
int ret = 0,
dummy = 0;
unsigned int len = GetColumnCount();
}
}
return ret;
+#endif
}
wxDataViewColumn *wxDataViewCtrl::GetSortingColumn() const
: GetColumn(m_sortingColumnIdx);
}
+wxDataViewItem wxDataViewCtrl::DoGetCurrentItem() const
+{
+ return GetItemByRow(m_clientArea->GetCurrentRow());
+}
+
+void wxDataViewCtrl::DoSetCurrentItem(const wxDataViewItem& item)
+{
+ const int row = m_clientArea->GetRowByItem(item);
+
+ const unsigned oldCurrent = m_clientArea->GetCurrentRow();
+ if ( static_cast<unsigned>(row) != oldCurrent )
+ {
+ m_clientArea->ChangeCurrentRow(row);
+ m_clientArea->RefreshRow(oldCurrent);
+ m_clientArea->RefreshRow(row);
+ }
+}
+
// Selection code with wxDataViewItem as parameters
wxDataViewItem wxDataViewCtrl::GetSelection() const
{
// Unselect all rows before select another in the single select mode
if (m_clientArea->IsSingleSel())
m_clientArea->SelectAllRows(false);
-
+
m_clientArea->SelectRow(row, true);
-
- // Also reset focus
- if (m_clientArea->IsSingleSel())
- m_clientArea->ChangeCurrentRow( row );
+
+ // Also set focus to the selected item
+ m_clientArea->ChangeCurrentRow( row );
}
}
void wxDataViewCtrl::Expand( const wxDataViewItem & item )
{
+ ExpandAncestors( item );
+
int row = m_clientArea->GetRowByItem( item );
if (row != -1)
m_clientArea->Expand(row);
wxRect itemRect = GetItemRect(item, col);
wxDataViewRenderer* renderer = col->GetRenderer();
- renderer->StartEditing(item, itemRect);
+ if (renderer->GetMode() == wxDATAVIEW_CELL_EDITABLE)
+ renderer->StartEditing(item, itemRect);
}
#endif // !wxUSE_GENERICDATAVIEWCTRL
projects / wxWidgets.git / blobdiff