X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/673810eeb8e16599b599f3a851692c323bc20165..3721dc6efe6f9ffe550c4c83bee2da210043bcaa:/src/gtk/dataview.cpp diff --git a/src/gtk/dataview.cpp b/src/gtk/dataview.cpp index a52da38744..f0e0d60b72 100644 --- a/src/gtk/dataview.cpp +++ b/src/gtk/dataview.cpp @@ -233,7 +233,7 @@ public: bool ItemChanged( const wxDataViewItem &item ); bool ValueChanged( const wxDataViewItem &item, unsigned int col ); bool Cleared(); - bool BeforeReset(size_t old_Size,size_t new_size); + bool BeforeReset(); bool AfterReset(); void Resort(); @@ -258,8 +258,12 @@ public: // item can be deleted already in the model int GetIndexOf( const wxDataViewItem &parent, const wxDataViewItem &item ); + virtual void OnInternalIdle(); + protected: void InitTree(); + void ScheduleRefresh(); + wxGtkTreeModelNode *FindNode( const wxDataViewItem &item ); wxGtkTreeModelNode *FindNode( GtkTreeIter *iter ); wxGtkTreeModelNode *FindParentNode( const wxDataViewItem &item ); @@ -282,8 +286,10 @@ private: GtkTargetEntry m_dropTargetTargetEntry; wxCharBuffer m_dropTargetTargetEntryTarget; wxDataObject *m_dropDataObject; - + wxGtkDataViewModelNotifier *m_notifier; + + bool m_dirty; }; @@ -1487,9 +1493,9 @@ public: virtual bool ValueChanged( const wxDataViewItem &item, unsigned int col ); virtual bool Cleared(); virtual void Resort(); - virtual bool BeforeReset(size_t old_size,size_t new_size); + virtual bool BeforeReset(); virtual bool AfterReset(); - + void UpdateLastCount(); private: @@ -1570,7 +1576,7 @@ void wxGtkDataViewModelNotifier::Resort() bool wxGtkDataViewModelNotifier::ItemChanged( const wxDataViewItem &item ) { GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); - + GtkTreeIter iter; iter.stamp = wxgtk_model->stamp; iter.user_data = (gpointer) item.GetID(); @@ -1589,7 +1595,7 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig { GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); wxDataViewCtrl *ctrl = m_internal->GetOwner(); - + // This adds GTK+'s missing MVC logic for ValueChanged unsigned int index; for (index = 0; index < ctrl->GetColumnCount(); index++) @@ -1627,44 +1633,44 @@ bool wxGtkDataViewModelNotifier::ValueChanged( const wxDataViewItem &item, unsig return false; } -bool wxGtkDataViewModelNotifier::BeforeReset(size_t WXUNUSED(old_size), size_t WXUNUSED(new_size)) +bool wxGtkDataViewModelNotifier::BeforeReset() { GtkWidget *treeview = m_internal->GetOwner()->GtkGetTreeView(); gtk_tree_view_set_model( GTK_TREE_VIEW(treeview), NULL ); - + return true; } bool wxGtkDataViewModelNotifier::AfterReset() { - GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); GtkWidget *treeview = m_internal->GetOwner()->GtkGetTreeView(); - + GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); + + m_internal->Cleared(); + gtk_tree_view_set_model( GTK_TREE_VIEW(treeview), GTK_TREE_MODEL(wxgtk_model) ); - m_internal->Cleared(); - return true; } bool wxGtkDataViewModelNotifier::Cleared() { GtkWxTreeModel *wxgtk_model = m_internal->GetGtkModel(); - + // There is no call to tell the model that everything // has been deleted so call row_deleted() for every // child of root... int count = m_internal->iter_n_children( NULL ); // number of children of root - + GtkTreePath *path = gtk_tree_path_new_first(); // points to root int i; for (i = 0; i < count; i++) gtk_tree_model_row_deleted( GTK_TREE_MODEL(wxgtk_model), path ); - + gtk_tree_path_free( path ); - + m_internal->Cleared(); return true; @@ -2635,7 +2641,7 @@ wxDataViewChoiceByIndexRenderer::wxDataViewChoiceByIndexRenderer( const wxArrayS wxDataViewChoiceRenderer( choices, mode, alignment ) { } - + void wxDataViewChoiceByIndexRenderer::GtkOnTextEdited(const gchar *itempath, const wxString& str) { wxVariant value( (long) GetChoices().Index( str ) ); @@ -2654,13 +2660,13 @@ bool wxDataViewChoiceByIndexRenderer::SetValue( const wxVariant &value ) wxVariant string_value = GetChoice( value.GetLong() ); return wxDataViewChoiceRenderer::SetValue( string_value ); } - + bool wxDataViewChoiceByIndexRenderer::GetValue( wxVariant &value ) const { wxVariant string_value; if (!wxDataViewChoiceRenderer::GetValue( string_value )) return false; - + value = (long) GetChoices().Index( string_value.GetString() ); return true; } @@ -3001,7 +3007,7 @@ void wxDataViewColumn::OnInternalIdle() { if (m_isConnected) return; - + if (GTK_WIDGET_REALIZED(GetOwner()->m_treeview)) { GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN(m_column); @@ -3011,8 +3017,8 @@ void wxDataViewColumn::OnInternalIdle() G_CALLBACK (gtk_dataview_header_button_press_callback), this); // otherwise the event will be blocked by GTK+ - gtk_tree_view_column_set_clickable( column, TRUE ); - + gtk_tree_view_column_set_clickable( column, TRUE ); + m_isConnected = true; } } @@ -3199,23 +3205,20 @@ int wxDataViewColumn::GetWidth() const void wxDataViewColumn::SetWidth( int width ) { - if (width < 0) + if ( width == wxCOL_WIDTH_AUTOSIZE ) { -#if 1 - gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED ); - - // TODO find a better calculation - gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), wxDVC_DEFAULT_WIDTH ); -#else - // this is unpractical for large numbers of items and disables - // user resizing, which is totally unexpected + // NB: this disables user resizing gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_AUTOSIZE ); -#endif } else { - gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED ); + if ( width == wxCOL_WIDTH_DEFAULT ) + { + // TODO find a better calculation + width = wxDVC_DEFAULT_WIDTH; + } + gtk_tree_view_column_set_sizing( GTK_TREE_VIEW_COLUMN(m_column), GTK_TREE_VIEW_COLUMN_FIXED ); gtk_tree_view_column_set_fixed_width( GTK_TREE_VIEW_COLUMN(m_column), width ); } } @@ -3380,7 +3383,7 @@ wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataVie { m_owner = owner; m_wx_model = wx_model; - + m_gtk_model = NULL; m_root = NULL; m_sort_order = GTK_SORT_ASCENDING; @@ -3390,6 +3393,8 @@ wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataVie m_dragDataObject = NULL; m_dropDataObject = NULL; + m_dirty = false; + m_gtk_model = wxgtk_tree_model_new(); m_gtk_model->internal = this; @@ -3401,7 +3406,7 @@ wxDataViewCtrlInternal::wxDataViewCtrlInternal( wxDataViewCtrl *owner, wxDataVie if (!m_wx_model->IsVirtualListModel()) InitTree(); - + gtk_tree_view_set_model( GTK_TREE_VIEW(m_owner->GtkGetTreeView()), GTK_TREE_MODEL(m_gtk_model) ); } @@ -3409,7 +3414,7 @@ wxDataViewCtrlInternal::~wxDataViewCtrlInternal() { m_wx_model->RemoveNotifier( m_notifier ); - // remove the model from the GtkTreeView before it gets destroyed + // remove the model from the GtkTreeView before it gets destroyed gtk_tree_view_set_model( GTK_TREE_VIEW( m_owner->GtkGetTreeView() ), NULL ); g_object_unref( m_gtk_model ); @@ -3418,6 +3423,21 @@ wxDataViewCtrlInternal::~wxDataViewCtrlInternal() delete m_dropDataObject; } +void wxDataViewCtrlInternal::ScheduleRefresh() +{ + m_dirty = true; +} + +void wxDataViewCtrlInternal::OnInternalIdle() +{ + if (m_dirty) + { + GtkWidget *widget = m_owner->GtkGetTreeView(); + gtk_widget_queue_draw( widget ); + m_dirty = false; + } +} + void wxDataViewCtrlInternal::InitTree() { wxDataViewItem item; @@ -3432,7 +3452,7 @@ void wxDataViewCtrlInternal::BuildBranch( wxGtkTreeModelNode *node ) { wxDataViewItemArray children; unsigned int count = m_wx_model->GetChildren( node->GetItem(), children ); - + unsigned int pos; for (pos = 0; pos < count; pos++) { @@ -3493,6 +3513,9 @@ gboolean wxDataViewCtrlInternal::row_draggable( GtkTreeDragSource *WXUNUSED(drag event.SetEventObject( m_owner ); event.SetItem( item ); event.SetModel( m_wx_model ); + gint x, y; + gtk_widget_get_pointer(m_owner->GtkGetTreeView(), &x, &y); + event.SetPosition(x, y); if (!m_owner->HandleWindowEvent( event )) return FALSE; @@ -3602,9 +3625,11 @@ bool wxDataViewCtrlInternal::Cleared() delete m_root; m_root = NULL; } - + InitTree(); - + + ScheduleRefresh(); + return true; } @@ -3612,6 +3637,8 @@ void wxDataViewCtrlInternal::Resort() { if (!m_wx_model->IsVirtualListModel()) m_root->Resort(); + + ScheduleRefresh(); } bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDataViewItem &item ) @@ -3628,6 +3655,8 @@ bool wxDataViewCtrlInternal::ItemAdded( const wxDataViewItem &parent, const wxDa parent_node->AddLeave( item.GetID() ); } + ScheduleRefresh(); + return true; } @@ -3642,6 +3671,8 @@ bool wxDataViewCtrlInternal::ItemDeleted( const wxDataViewItem &parent, const wx parent_node->DeleteChild( item.GetID() ); } + ScheduleRefresh(); + return true; } @@ -3768,7 +3799,7 @@ GtkTreePath *wxDataViewCtrlInternal::get_path( GtkTreeIter *iter ) while (node) { int pos = node->GetChildren().Index( id ); - + gtk_tree_path_prepend_index( retval, pos ); id = node->GetItem().GetID(); @@ -4508,6 +4539,8 @@ void wxDataViewCtrl::OnInternalIdle() { wxWindow::OnInternalIdle(); + m_internal->OnInternalIdle(); + unsigned int cols = GetColumnCount(); unsigned int i; for (i = 0; i < cols; i++) @@ -4515,6 +4548,16 @@ void wxDataViewCtrl::OnInternalIdle() wxDataViewColumn *col = GetColumn( i ); col->OnInternalIdle(); } + + if (m_ensureVisibleDefered.IsOk()) + { + ExpandAncestors(m_ensureVisibleDefered); + GtkTreeIter iter; + iter.user_data = (gpointer) m_ensureVisibleDefered.GetID(); + wxGtkTreePath path(m_internal->get_path( &iter )); + gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 ); + m_ensureVisibleDefered = wxDataViewItem(0); + } } bool wxDataViewCtrl::AssociateModel( wxDataViewModel *model ) @@ -4915,6 +4958,7 @@ void wxDataViewCtrl::UnselectAll() void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item, const wxDataViewColumn *WXUNUSED(column)) { + m_ensureVisibleDefered = item; ExpandAncestors(item); GtkTreeIter iter; @@ -4923,12 +4967,54 @@ void wxDataViewCtrl::EnsureVisible(const wxDataViewItem& item, gtk_tree_view_scroll_to_cell( GTK_TREE_VIEW(m_treeview), path, NULL, false, 0.0, 0.0 ); } -void wxDataViewCtrl::HitTest(const wxPoint& WXUNUSED(point), +void wxDataViewCtrl::HitTest(const wxPoint& point, wxDataViewItem& item, wxDataViewColumn *& column) const { - item = wxDataViewItem(0); - column = NULL; + // gtk_tree_view_get_dest_row_at_pos() is the right one. But it does not tell the column. + // gtk_tree_view_get_path_at_pos() is the wrong function. It doesn't mind the header but returns column. + // See http://mail.gnome.org/archives/gtkmm-list/2005-January/msg00080.html + // So we have to use both of them. + // Friedrich Haase 2010-9-20 + wxGtkTreePath path, pathScratch; + GtkTreeViewColumn* GtkColumn = NULL; + GtkTreeViewDropPosition pos = GTK_TREE_VIEW_DROP_INTO_OR_AFTER; + gint cell_x = 0; + gint cell_y = 0; + + // cannot directly call GtkGetTreeView(), HitTest is const and so is this pointer + wxDataViewCtrl* ctrl = (wxDataViewCtrl*)this; // ugly workaround, ctrl is NOT const + GtkTreeView* treeView = GTK_TREE_VIEW(ctrl->GtkGetTreeView()); + + // is there possibly a better suited function to get the column? + gtk_tree_view_get_path_at_pos( // and this is the wrong call but it delivers the column + treeView, + (int) point.x, (int) point.y, + pathScratch.ByRef(), + &GtkColumn, // here we get the GtkColumn + &cell_x, + &cell_y ); + + if ( GtkColumn != NULL ) + { + // we got GTK column + // the right call now which takes the header into account + gtk_tree_view_get_dest_row_at_pos( treeView, (int) point.x, (int) point.y, path.ByRef(), &pos); + + if (path) + item = wxDataViewItem(GTKPathToItem(path)); + // else we got a GTK column but the position is not over an item, e.g. below last item + for ( unsigned int i=0, cols=GetColumnCount(); iGetGtkHandle()) == GtkColumn ) + { + column = col; // here we get the wx column + break; + } + } + } + // else no column and thus no item, both null } wxRect