AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'property-selection' into 'master'

Browse Source 
Property selection

Closes #2826

See merge request GNOME/gtk!2054
This commit is contained in:
Matthias Clasen 2020-06-06 17:35:05 +00:00
commit 8fca040163
11 changed files with 567 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
demos/gtk-demo/listview_colors.c
View File

@ -25,6 +25,7 @@ struct _GtkColor
char *name;
GdkRGBA *color;
int h, s, v;
gboolean selected;
};
enum {
@ -37,6 +38,7 @@ enum {
PROP_HUE,
PROP_SATURATION,
PROP_VALUE,
PROP_SELECTED,
N_PROPS
};
@ -124,6 +126,10 @@ gtk_color_get_property (GObject *object,
g_value_set_int (value, self->v);
break;
case PROP_SELECTED:
g_value_set_boolean (value, self->selected);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@ -160,6 +166,10 @@ gtk_color_set_property (GObject *object,
self->v = g_value_get_int (value);
break;
case PROP_SELECTED:
self->selected = g_value_get_boolean (value);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
break;
@ -202,6 +212,8 @@ gtk_color_class_init (GtkColorClass *klass)
g_param_spec_int ("saturation", NULL, NULL, 0, 100, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
properties[PROP_VALUE] =
g_param_spec_int ("value", NULL, NULL, 0, 100, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
properties[PROP_SELECTED] =
g_param_spec_boolean ("selected", NULL, NULL, FALSE, G_PARAM_READWRITE);
g_object_class_install_properties (gobject_class, N_PROPS, properties);
}
@ -261,7 +273,7 @@ create_colors_model (void)
h = atoi (fields[9]);
s = atoi (fields[10]);
v = atoi (fields[11]);
color = gtk_color_new (name, red / 255., green / 255., blue / 255., h, s, v);
g_list_store_append (result, color);
g_object_unref (color);
@ -427,7 +439,7 @@ create_color_grid (void)
gtk_grid_view_set_enable_rubberband (GTK_GRID_VIEW (gridview), TRUE);
model = G_LIST_MODEL (gtk_sort_list_model_new (create_colors_model (), NULL));
selection = G_LIST_MODEL (gtk_multi_selection_new (model));
selection = G_LIST_MODEL (gtk_property_selection_new (model, "selected"));
gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), selection);
g_object_unref (selection);
g_object_unref (model);

1
docs/reference/gtk/gtk4-docs.xml
View File

@ -71,6 +71,7 @@
<xi:include href="xml/gtknoselection.xml" />
<xi:include href="xml/gtksingleselection.xml" />
<xi:include href="xml/gtkmultiselection.xml" />
<xi:include href="xml/gtkpropertyselection.xml" />
<xi:include href="xml/gtkdirectorylist.xml" />
</chapter>

9
docs/reference/gtk/gtk4-sections.txt
View File

@ -401,6 +401,15 @@ gtk_multi_selection_new
gtk_multi_selection_get_type
</SECTION>
<SECTION>
<FILE>gtkpropertyselection</FILE>
<TITLE>GtkPropertySelection</TITLE>
GtkPropertySelection
gtk_property_selection_new
<SUBSECTION Private>
gtk_property_selection_get_type
</SECTION>
<SECTION>
<FILE>gtklistitem</FILE>
<TITLE>GtkListItem</TITLE>

1
docs/reference/gtk/gtk4.types.in
View File

@ -169,6 +169,7 @@ gtk_print_operation_preview_get_type
gtk_print_settings_get_type
@DISABLE_ON_W32@gtk_print_unix_dialog_get_type
gtk_progress_bar_get_type
gtk_property_selection_get_type
gtk_radio_button_get_type
gtk_range_get_type
gtk_recent_manager_get_type

1
gtk/gtk.h
View File

@ -198,6 +198,7 @@
#include <gtk/gtkprintoperationpreview.h>
#include <gtk/gtkprintsettings.h>
#include <gtk/gtkprogressbar.h>
#include <gtk/gtkpropertyselection.h>
#include <gtk/gtkradiobutton.h>
#include <gtk/gtkrange.h>
#include <gtk/gtkrecentmanager.h>

487
gtk/gtkpropertyselection.c Normal file
View File

@ -0,0 +1,487 @@
/*
* Copyright © 2020 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* Authors: Matthias Clasen <mclasen@redhat.com>
*/
#include "config.h"
#include "gtkpropertyselection.h"
#include "gtkintl.h"
#include "gtkselectionmodel.h"
/**
* SECTION:gtkpropertyselection
* @Short_description: A selection model that uses an item property
* @Title: GtkPropertySelection
* @see_also: #GtkSelectionModel
*
* GtkPropertySelection is an implementation of the #GtkSelectionModel
* interface that stores the selected state for each item in a property
* of the item.
*
* The property named by #GtkPropertySelection:property must be writable
* boolean property of the item type. GtkPropertySelection preserves the
* selected state of items when they are added to the model, but it does
* not listen to changes of the property while the item is a part of the
* model. It assumes that it has *exclusive* access to the property.
*
* The advantage of storing the selected state in item properties is that
* the state is *persistent* -- when an item is removed and re-added to
* the model, it will still have the same selection state. In particular,
* this makes the selection persist across changes of the sort order if
* the underlying model is a #GtkSortListModel.
*/
struct _GtkPropertySelection
{
GObject parent_instance;
GListModel *model;
char *property;
};
struct _GtkPropertySelectionClass
{
GObjectClass parent_class;
};
enum {
PROP_0,
PROP_MODEL,
PROP_PROPERTY,
N_PROPS,
};
static GParamSpec *properties[N_PROPS] = { NULL, };
static GType
gtk_property_selection_get_item_type (GListModel *list)
{
GtkPropertySelection *self = GTK_PROPERTY_SELECTION (list);
return g_list_model_get_item_type (self->model);
}
static guint
gtk_property_selection_get_n_items (GListModel *list)
{
GtkPropertySelection *self = GTK_PROPERTY_SELECTION (list);
return g_list_model_get_n_items (self->model);
}
static gpointer
gtk_property_selection_get_item (GListModel *list,
guint position)
{
GtkPropertySelection *self = GTK_PROPERTY_SELECTION (list);
return g_list_model_get_item (self->model, position);
}
static void
gtk_property_selection_list_model_init (GListModelInterface *iface)
{
iface->get_item_type = gtk_property_selection_get_item_type;
iface->get_n_items = gtk_property_selection_get_n_items;
iface->get_item = gtk_property_selection_get_item;
}
static gboolean
is_selected (GtkPropertySelection *self,
guint position)
{
gpointer item;
gboolean ret;
item = g_list_model_get_item (self->model, position);
g_object_get (item, self->property, &ret, NULL);
g_object_unref (item);
return ret;
}
static void
set_selected (GtkPropertySelection *self,
guint position,
gboolean selected)
{
gpointer item;
item = g_list_model_get_item (self->model, position);
g_object_set (item, self->property, selected, NULL);
g_object_unref (item);
}
static gboolean
gtk_property_selection_is_selected (GtkSelectionModel *model,
guint position)
{
return is_selected (GTK_PROPERTY_SELECTION (model), position);
}
static gboolean
gtk_property_selection_select_range (GtkSelectionModel *model,
guint position,
guint n_items,
gboolean exclusive)
{
GtkPropertySelection *self = GTK_PROPERTY_SELECTION (model);
guint i;
guint n;
n = g_list_model_get_n_items (G_LIST_MODEL (self));
if (exclusive)
{
for (i = 0; i < n; i++)
set_selected (self, i, FALSE);
}
for (i = position; i < position + n_items; i++)
set_selected (self, i, TRUE);
/* FIXME: do better here */
if (exclusive)
gtk_selection_model_selection_changed (model, 0, n);
else
gtk_selection_model_selection_changed (model, position, n_items);
return TRUE;
}
static gboolean
gtk_property_selection_unselect_range (GtkSelectionModel *model,
guint position,
guint n_items)
{
GtkPropertySelection *self = GTK_PROPERTY_SELECTION (model);
guint i;
for (i = position; i < position + n_items; i++)
set_selected (self, i, FALSE);
gtk_selection_model_selection_changed (model, position, n_items);
return TRUE;
}
static gboolean
gtk_property_selection_select_item (GtkSelectionModel *model,
guint position,
gboolean exclusive)
{
return gtk_property_selection_select_range (model, position, 1, exclusive);
}
static gboolean
gtk_property_selection_unselect_item (GtkSelectionModel *model,
guint position)
{
return gtk_property_selection_unselect_range (model, position, 1);
}
static gboolean
gtk_property_selection_select_all (GtkSelectionModel *model)
{
return gtk_property_selection_select_range (model, 0, g_list_model_get_n_items (G_LIST_MODEL (model)), FALSE);
}
static gboolean
gtk_property_selection_unselect_all (GtkSelectionModel *model)
{
return gtk_property_selection_unselect_range (model, 0, g_list_model_get_n_items (G_LIST_MODEL (model)));
}
static gboolean
gtk_property_selection_add_or_remove (GtkSelectionModel *model,
gboolean add,
GtkSelectionCallback callback,
gpointer data)
{
GtkPropertySelection *self = GTK_PROPERTY_SELECTION (model);
guint pos, start, n;
gboolean in;
guint min, max;
guint i;
min = G_MAXUINT;
max = 0;
pos = 0;
do
{
callback (pos, &start, &n, &in, data);
if (in)
{
if (start < min)
min = start;
if (start + n - 1 > max)
max = start + n - 1;
for (i = start; i < start + n; i++)
set_selected (self, i, add);
}
pos = start + n;
}
while (n > 0);
if (min <= max)
gtk_selection_model_selection_changed (model, min, max - min + 1);
return TRUE;
}
static gboolean
gtk_property_selection_select_callback (GtkSelectionModel *model,
GtkSelectionCallback callback,
gpointer data)
{
return gtk_property_selection_add_or_remove (model, TRUE, callback, data);
}
static gboolean
gtk_property_selection_unselect_callback (GtkSelectionModel *model,
GtkSelectionCallback callback,
gpointer data)
{
return gtk_property_selection_add_or_remove (model, FALSE, callback, data);
}
static void
gtk_property_selection_query_range (GtkSelectionModel *model,
guint position,
guint *start_range,
guint *n_items,
gboolean *selected)
{
GtkPropertySelection *self = GTK_PROPERTY_SELECTION (model);
guint n;
gboolean sel;
guint start, end;
n = g_list_model_get_n_items (G_LIST_MODEL (self));
sel = is_selected (self, position);
start = position;
while (start > 0)
{
if (is_selected (self, start - 1) != sel)
break;
start--;
}
end = position;
while (end + 1 < n)
{
if (is_selected (self, end + 1) != sel)
break;
end++;
}
*start_range = start;
*n_items = end - start + 1;
*selected = sel;
}
static void
gtk_property_selection_selection_model_init (GtkSelectionModelInterface *iface)
{
iface->is_selected = gtk_property_selection_is_selected;
iface->select_item = gtk_property_selection_select_item;
iface->unselect_item = gtk_property_selection_unselect_item;
iface->select_range = gtk_property_selection_select_range;
iface->unselect_range = gtk_property_selection_unselect_range;
iface->select_all = gtk_property_selection_select_all;
iface->unselect_all = gtk_property_selection_unselect_all;
iface->select_callback = gtk_property_selection_select_callback;
iface->unselect_callback = gtk_property_selection_unselect_callback;
iface->query_range = gtk_property_selection_query_range;
}
G_DEFINE_TYPE_EXTENDED (GtkPropertySelection, gtk_property_selection, G_TYPE_OBJECT, 0,
G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL,
gtk_property_selection_list_model_init)
G_IMPLEMENT_INTERFACE (GTK_TYPE_SELECTION_MODEL,
gtk_property_selection_selection_model_init))
static void
gtk_property_selection_items_changed_cb (GListModel *model,
guint position,
guint removed,
guint added,
GtkPropertySelection *self)
{
g_list_model_items_changed (G_LIST_MODEL (self), position, removed, added);
}
static void
gtk_property_selection_clear_model (GtkPropertySelection *self)
{
if (self->model == NULL)
return;
g_signal_handlers_disconnect_by_func (self->model,
gtk_property_selection_items_changed_cb,
self);
g_clear_object (&self->model);
}
static void
gtk_property_selection_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
GtkPropertySelection *self = GTK_PROPERTY_SELECTION (object);
switch (prop_id)
{
case PROP_MODEL:
self->model = g_value_dup_object (value);
g_warn_if_fail (self->model != NULL);
g_signal_connect (self->model,
"items-changed",
G_CALLBACK (gtk_property_selection_items_changed_cb),
self);
break;
case PROP_PROPERTY:
{
GObjectClass *class;
GParamSpec *prop;
self->property = g_value_dup_string (value);
g_warn_if_fail (self->property != NULL);
class = g_type_class_ref (g_list_model_get_item_type (self->model));
prop = g_object_class_find_property (class, self->property);
g_warn_if_fail (prop != NULL &&
prop->value_type == G_TYPE_BOOLEAN &&
((prop->flags & (G_PARAM_READABLE|G_PARAM_WRITABLE|G_PARAM_CONSTRUCT_ONLY)) ==
(G_PARAM_READABLE|G_PARAM_WRITABLE)));
g_type_class_unref (class);
}
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gtk_property_selection_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
GtkPropertySelection *self = GTK_PROPERTY_SELECTION (object);
switch (prop_id)
{
case PROP_MODEL:
g_value_set_object (value, self->model);
break;
case PROP_PROPERTY:
g_value_set_string (value, self->property);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gtk_property_selection_dispose (GObject *object)
{
GtkPropertySelection *self = GTK_PROPERTY_SELECTION (object);
gtk_property_selection_clear_model (self);
g_free (self->property);
G_OBJECT_CLASS (gtk_property_selection_parent_class)->dispose (object);
}
static void
gtk_property_selection_class_init (GtkPropertySelectionClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
gobject_class->get_property = gtk_property_selection_get_property;
gobject_class->set_property = gtk_property_selection_set_property;
gobject_class->dispose = gtk_property_selection_dispose;
/**
* GtkPropertySelection:model
*
* The list managed by this selection
*/
properties[PROP_MODEL] =
g_param_spec_object ("model",
P_("Model"),
P_("List managed by this selection"),
G_TYPE_LIST_MODEL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
properties[PROP_PROPERTY] =
g_param_spec_string ("property",
P_("Property"),
P_("Item property to store selection state in"),
NULL,
G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (gobject_class, N_PROPS, properties);
}
static void
gtk_property_selection_init (GtkPropertySelection *self)
{
}
/**
* gtk_property_selection_new:
* @model: (transfer none): the #GListModel to manage
* @property: the item property to use
*
* Creates a new property selection to handle @model.
*
* @property must be the name of a writable boolean property
* of the item type of @model.
*
* Note that GtkPropertySelection does not monitor the property
* for changes while the item is part of the model, but it does
* inherit the initial value when an item is added to the model.
*
* Returns: (transfer full) (type GtkPropertySelection): a new #GtkPropertySelection
**/
GListModel *
gtk_property_selection_new (GListModel *model,
const char *property)
{
g_return_val_if_fail (G_IS_LIST_MODEL (model), NULL);
return g_object_new (GTK_TYPE_PROPERTY_SELECTION,
"model", model,
"property", property,
NULL);
}

40
gtk/gtkpropertyselection.h Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright © 2019 Red Hat, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* Authors: Matthias Clasen <mclasen@redhat.com>
*/
#ifndef __GTK_PROPERTY_SELECTION_H__
#define __GTK_PROPERTY_SELECTION_H__
#include <gtk/gtktypes.h>
#include <gtk/gtkselectionmodel.h>
G_BEGIN_DECLS
#define GTK_TYPE_PROPERTY_SELECTION (gtk_property_selection_get_type ())
GDK_AVAILABLE_IN_ALL
G_DECLARE_FINAL_TYPE (GtkPropertySelection, gtk_property_selection, GTK, PROPERTY_SELECTION, GObject)
GDK_AVAILABLE_IN_ALL
GListModel * gtk_property_selection_new (GListModel *model,
const char *property);
G_END_DECLS
#endif /* __GTK_PROPERTY_SELECTION_H__ */

2
gtk/meson.build
View File

@ -327,6 +327,7 @@ gtk_public_sources = files([
'gtkprintsettings.c',
'gtkprogressbar.c',
'gtkpropertylookuplistmodel.c',
'gtkpropertyselection.c',
'gtkradiobutton.c',
'gtkrange.c',
'gtktreerbtree.c',
@ -600,6 +601,7 @@ gtk_public_headers = files([
'gtkprintoperationpreview.h',
'gtkprintsettings.h',
'gtkprogressbar.h',
'gtkpropertyselection.h',
'gtkradiobutton.h',
'gtkrange.h',
'gtkrecentmanager.h',

3
testsuite/gtk/defaultvalue.c
View File

@ -104,6 +104,9 @@ test_type (gconstpointer data)
g_type_is_a (type, GTK_TYPE_SHORTCUT_ACTION))
return;
if (g_type_is_a (type, GTK_TYPE_PROPERTY_SELECTION))
return;
klass = g_type_class_ref (type);
if (g_type_is_a (type, GTK_TYPE_SETTINGS))

4
testsuite/gtk/notify.c
View File

@ -425,6 +425,10 @@ test_type (gconstpointer data)
g_type_is_a (type, GTK_TYPE_NAMED_ACTION))
return;
/* needs special item type in underlying model */
if (g_type_is_a (type, GTK_TYPE_PROPERTY_SELECTION))
return;
klass = g_type_class_ref (type);
if (g_type_is_a (type, GTK_TYPE_SETTINGS))

7
testsuite/gtk/objects-finalize.c
View File

@ -80,9 +80,12 @@ test_finalize_object (gconstpointer data)
NULL);
g_object_unref (list_store);
}
else if (g_type_is_a (test_type, GTK_TYPE_LAYOUT_CHILD))
else if (g_type_is_a (test_type, GTK_TYPE_LAYOUT_CHILD) ||
g_type_is_a (test_type, GTK_TYPE_PROPERTY_SELECTION))
{
g_test_skip ("Skipping GtkLayoutChild type");
char *msg = g_strdup_printf ("Skipping %s", g_type_name (test_type));
g_test_skip (msg);
g_free (msg);
return;
}
else