callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

list box: Warn for nonworking configurations

Browse Source 
GtkListBox sort and filter functionality does not work with
models. Issue a warning in this case.

http://bugzilla.gnome.org/show_bug.cgi?id=752615
This commit is contained in:
Matthias Clasen
2015-08-25 13:16:24 -04:00
parent a5e2256770
commit a27309c6e4
1 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtklistbox.c
View File

@ -272,6 +272,7 @@ static void gtk_list_box_bound_model_changed (GListMo
guint added, guint added,
gpointer user_data); gpointer user_data);
static void gtk_list_box_check_model_compat (GtkListBox *box);
static GParamSpec *properties[LAST_PROPERTY] = { NULL, }; static GParamSpec *properties[LAST_PROPERTY] = { NULL, };
static guint signals[LAST_SIGNAL] = { 0 }; static guint signals[LAST_SIGNAL] = { 0 };
static GParamSpec *row_properties[LAST_ROW_PROPERTY] = { NULL, }; static GParamSpec *row_properties[LAST_ROW_PROPERTY] = { NULL, };
@ -1101,6 +1102,8 @@ gtk_list_box_set_filter_func (GtkListBox *box,
priv->filter_func_target = user_data; priv->filter_func_target = user_data;
priv->filter_func_target_destroy_notify = destroy; priv->filter_func_target_destroy_notify = destroy;
gtk_list_box_check_model_compat (box);
gtk_list_box_invalidate_filter (box); gtk_list_box_invalidate_filter (box);
} }
@ -1297,6 +1300,8 @@ gtk_list_box_set_sort_func (GtkListBox *box,
priv->sort_func_target = user_data; priv->sort_func_target = user_data;
priv->sort_func_target_destroy_notify = destroy; priv->sort_func_target_destroy_notify = destroy;
gtk_list_box_check_model_compat (box);
gtk_list_box_invalidate_sort (box); gtk_list_box_invalidate_sort (box);
} }
@ -3728,6 +3733,16 @@ gtk_list_box_bound_model_changed (GListModel *list,
} }
} }
static void
gtk_list_box_check_model_compat (GtkListBox *box)
{
GtkListBoxPrivate *priv = BOX_PRIV (box);
if (priv->bound_model &&
(priv->sort_func || priv->filter_func))
g_warning ("GtkListBox with a model will ignore sort and filter functions");
}
/** /**
* gtk_list_box_bind_model: * gtk_list_box_bind_model:
* @box: a #GtkListBox * @box: a #GtkListBox
@ -3752,11 +3767,11 @@ gtk_list_box_bound_model_changed (GListModel *list,
* Since: 3.16 * Since: 3.16
*/ */
void void
gtk_list_box_bind_model (GtkListBox *box, gtk_list_box_bind_model (GtkListBox *box,
GListModel *model, GListModel *model,
GtkListBoxCreateWidgetFunc create_widget_func, GtkListBoxCreateWidgetFunc create_widget_func,
gpointer user_data, gpointer user_data,
GDestroyNotify user_data_free_func) GDestroyNotify user_data_free_func)
{ {
GtkListBoxPrivate *priv = BOX_PRIV (box); GtkListBoxPrivate *priv = BOX_PRIV (box);
@ -3783,6 +3798,8 @@ gtk_list_box_bind_model (GtkListBox *box,
priv->create_widget_func_data = user_data; priv->create_widget_func_data = user_data;
priv->create_widget_func_data_destroy = user_data_free_func; priv->create_widget_func_data_destroy = user_data_free_func;
gtk_list_box_check_model_compat (box);
g_signal_connect (priv->bound_model, "items-changed", G_CALLBACK (gtk_list_box_bound_model_changed), box); g_signal_connect (priv->bound_model, "items-changed", G_CALLBACK (gtk_list_box_bound_model_changed), box);
gtk_list_box_bound_model_changed (model, 0, 0, g_list_model_get_n_items (model), box); gtk_list_box_bound_model_changed (model, 0, 0, g_list_model_get_n_items (model), box);
} }