Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

columnview: Rename to GtkColumnViewCellWidget

Browse Source 
Just like with Row/RowWidget, I want to use Cell/CellWidget.
This commit is contained in:
Benjamin Otte
2023-03-27 20:53:48 +02:00
parent 7cfab4edf2
commit 1a6afebbda
8 changed files with 115 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
gtk/gtkcolumnviewcellprivate.h
View File

@@ -1,47 +0,0 @@
/*
* Copyright © 2019 Benjamin Otte
*
* 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: Benjamin Otte <otte@gnome.org>
*/
#pragma once
#include "gtkcolumnviewcolumn.h"
G_BEGIN_DECLS
#define GTK_TYPE_COLUMN_VIEW_CELL (gtk_column_view_cell_get_type ())
#define GTK_COLUMN_VIEW_CELL(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_COLUMN_VIEW_CELL, GtkColumnViewCell))
#define GTK_COLUMN_VIEW_CELL_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GTK_TYPE_COLUMN_VIEW_CELL, GtkColumnViewCellClass))
#define GTK_IS_COLUMN_VIEW_CELL(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_COLUMN_VIEW_CELL))
#define GTK_IS_COLUMN_VIEW_CELL_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_TYPE_COLUMN_VIEW_CELL))
#define GTK_COLUMN_VIEW_CELL_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_COLUMN_VIEW_CELL, GtkColumnViewCellClass))
typedef struct _GtkColumnViewCell GtkColumnViewCell;
typedef struct _GtkColumnViewCellClass GtkColumnViewCellClass;
GType gtk_column_view_cell_get_type (void) G_GNUC_CONST;
GtkWidget * gtk_column_view_cell_new (GtkColumnViewColumn *column);
void gtk_column_view_cell_remove (GtkColumnViewCell *self);
GtkColumnViewCell * gtk_column_view_cell_get_next (GtkColumnViewCell *self);
GtkColumnViewCell * gtk_column_view_cell_get_prev (GtkColumnViewCell *self);
GtkColumnViewColumn * gtk_column_view_cell_get_column (GtkColumnViewCell *self);
G_END_DECLS

92
gtk/gtkcolumnviewcell.c → gtk/gtkcolumnviewcellwidget.c
View File

@@ -19,7 +19,7 @@
#include "config.h"
#include "gtkcolumnviewcellprivate.h"
#include "gtkcolumnviewcellwidgetprivate.h"
#include "gtkcolumnviewcolumnprivate.h"
#include "gtkcolumnviewrowwidgetprivate.h"
@@ -31,26 +31,26 @@
#include "gtkwidgetprivate.h"
struct _GtkColumnViewCell
struct _GtkColumnViewCellWidget
{
GtkListItemWidget parent_instance;
GtkColumnViewColumn *column;
/* This list isn't sorted - next/prev refer to list elements, not rows in the list */
GtkColumnViewCell *next_cell;
GtkColumnViewCell *prev_cell;
GtkColumnViewCellWidget *next_cell;
GtkColumnViewCellWidget *prev_cell;
};
struct _GtkColumnViewCellClass
struct _GtkColumnViewCellWidgetClass
{
GtkListItemWidgetClass parent_class;
};
G_DEFINE_TYPE (GtkColumnViewCell, gtk_column_view_cell, GTK_TYPE_LIST_ITEM_WIDGET)
G_DEFINE_TYPE (GtkColumnViewCellWidget, gtk_column_view_cell_widget, GTK_TYPE_LIST_ITEM_WIDGET)
static gpointer
gtk_column_view_cell_create_object (GtkListFactoryWidget *fw)
gtk_column_view_cell_widget_create_object (GtkListFactoryWidget *fw)
{
GtkListItem *list_item;
@@ -64,10 +64,10 @@ gtk_column_view_cell_create_object (GtkListFactoryWidget *fw)
}
static void
gtk_column_view_cell_teardown_object (GtkListFactoryWidget *fw,
gpointer object)
gtk_column_view_cell_widget_teardown_object (GtkListFactoryWidget *fw,
gpointer object)
{
GTK_LIST_FACTORY_WIDGET_CLASS (gtk_column_view_cell_parent_class)->teardown_object (fw, object);
GTK_LIST_FACTORY_WIDGET_CLASS (gtk_column_view_cell_widget_parent_class)->teardown_object (fw, object);
gtk_widget_set_focusable (GTK_WIDGET (fw), FALSE);
}
@@ -104,15 +104,15 @@ unadjust_width (GtkWidget *widget,
}
static void
gtk_column_view_cell_measure (GtkWidget *widget,
GtkOrientation orientation,
int for_size,
int *minimum,
int *natural,
int *minimum_baseline,
int *natural_baseline)
gtk_column_view_cell_widget_measure (GtkWidget *widget,
GtkOrientation orientation,
int for_size,
int *minimum,
int *natural,
int *minimum_baseline,
int *natural_baseline)
{
GtkColumnViewCell *cell = GTK_COLUMN_VIEW_CELL (widget);
GtkColumnViewCellWidget *cell = GTK_COLUMN_VIEW_CELL_WIDGET (widget);
GtkWidget *child = gtk_widget_get_first_child (widget);
int fixed_width = gtk_column_view_column_get_fixed_width (cell->column);
int unadj_width;
@@ -144,10 +144,10 @@ gtk_column_view_cell_measure (GtkWidget *widget,
}
static void
gtk_column_view_cell_size_allocate (GtkWidget *widget,
int width,
int height,
int baseline)
gtk_column_view_cell_widget_size_allocate (GtkWidget *widget,
int width,
int height,
int baseline)
{
GtkWidget *child = gtk_widget_get_first_child (widget);
@@ -162,9 +162,9 @@ gtk_column_view_cell_size_allocate (GtkWidget *widget,
}
static void
gtk_column_view_cell_dispose (GObject *object)
gtk_column_view_cell_widget_dispose (GObject *object)
{
GtkColumnViewCell *self = GTK_COLUMN_VIEW_CELL (object);
GtkColumnViewCellWidget *self = GTK_COLUMN_VIEW_CELL_WIDGET (object);
if (self->column)
{
@@ -181,11 +181,11 @@ gtk_column_view_cell_dispose (GObject *object)
g_clear_object (&self->column);
}
G_OBJECT_CLASS (gtk_column_view_cell_parent_class)->dispose (object);
G_OBJECT_CLASS (gtk_column_view_cell_widget_parent_class)->dispose (object);
}
static GtkSizeRequestMode
gtk_column_view_cell_get_request_mode (GtkWidget *widget)
gtk_column_view_cell_widget_get_request_mode (GtkWidget *widget)
{
GtkWidget *child = gtk_widget_get_first_child (widget);
@@ -196,36 +196,36 @@ gtk_column_view_cell_get_request_mode (GtkWidget *widget)
}
static void
gtk_column_view_cell_class_init (GtkColumnViewCellClass *klass)
gtk_column_view_cell_widget_class_init (GtkColumnViewCellWidgetClass *klass)
{
GtkListFactoryWidgetClass *factory_class = GTK_LIST_FACTORY_WIDGET_CLASS (klass);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
factory_class->create_object = gtk_column_view_cell_create_object;
factory_class->teardown_object = gtk_column_view_cell_teardown_object;
factory_class->create_object = gtk_column_view_cell_widget_create_object;
factory_class->teardown_object = gtk_column_view_cell_widget_teardown_object;
widget_class->measure = gtk_column_view_cell_measure;
widget_class->size_allocate = gtk_column_view_cell_size_allocate;
widget_class->get_request_mode = gtk_column_view_cell_get_request_mode;
widget_class->measure = gtk_column_view_cell_widget_measure;
widget_class->size_allocate = gtk_column_view_cell_widget_size_allocate;
widget_class->get_request_mode = gtk_column_view_cell_widget_get_request_mode;
gobject_class->dispose = gtk_column_view_cell_dispose;
gobject_class->dispose = gtk_column_view_cell_widget_dispose;
gtk_widget_class_set_css_name (widget_class, I_("cell"));
gtk_widget_class_set_accessible_role (widget_class, GTK_ACCESSIBLE_ROLE_GRID_CELL);
}
static void
gtk_column_view_cell_resize_func (GtkWidget *widget)
gtk_column_view_cell_widget_resize_func (GtkWidget *widget)
{
GtkColumnViewCell *self = GTK_COLUMN_VIEW_CELL (widget);
GtkColumnViewCellWidget *self = GTK_COLUMN_VIEW_CELL_WIDGET (widget);
if (self->column)
gtk_column_view_column_queue_resize (self->column);
}
static void
gtk_column_view_cell_init (GtkColumnViewCell *self)
gtk_column_view_cell_widget_init (GtkColumnViewCellWidget *self)
{
GtkWidget *widget = GTK_WIDGET (self);
@@ -233,15 +233,15 @@ gtk_column_view_cell_init (GtkColumnViewCell *self)
gtk_widget_set_overflow (widget, GTK_OVERFLOW_HIDDEN);
/* FIXME: Figure out if setting the manager class to INVALID should work */
gtk_widget_set_layout_manager (widget, NULL);
widget->priv->resize_func = gtk_column_view_cell_resize_func;
widget->priv->resize_func = gtk_column_view_cell_widget_resize_func;
}
GtkWidget *
gtk_column_view_cell_new (GtkColumnViewColumn *column)
gtk_column_view_cell_widget_new (GtkColumnViewColumn *column)
{
GtkColumnViewCell *self;
GtkColumnViewCellWidget *self;
self = g_object_new (GTK_TYPE_COLUMN_VIEW_CELL,
self = g_object_new (GTK_TYPE_COLUMN_VIEW_CELL_WIDGET,
"factory", gtk_column_view_column_get_factory (column),
NULL);
@@ -257,27 +257,27 @@ gtk_column_view_cell_new (GtkColumnViewColumn *column)
}
void
gtk_column_view_cell_remove (GtkColumnViewCell *self)
gtk_column_view_cell_widget_remove (GtkColumnViewCellWidget *self)
{
GtkWidget *widget = GTK_WIDGET (self);
gtk_column_view_row_widget_remove_child (GTK_COLUMN_VIEW_ROW_WIDGET (gtk_widget_get_parent (widget)), widget);
}
GtkColumnViewCell *
gtk_column_view_cell_get_next (GtkColumnViewCell *self)
GtkColumnViewCellWidget *
gtk_column_view_cell_widget_get_next (GtkColumnViewCellWidget *self)
{
return self->next_cell;
}
GtkColumnViewCell *
gtk_column_view_cell_get_prev (GtkColumnViewCell *self)
GtkColumnViewCellWidget *
gtk_column_view_cell_widget_get_prev (GtkColumnViewCellWidget *self)
{
return self->prev_cell;
}
GtkColumnViewColumn *
gtk_column_view_cell_get_column (GtkColumnViewCell *self)
gtk_column_view_cell_widget_get_column (GtkColumnViewCellWidget *self)
{
return self->column;
}

46
gtk/gtkcolumnviewcellwidgetprivate.h Normal file
View File

@@ -0,0 +1,46 @@
/*
* Copyright © 2019 Benjamin Otte
*
* 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: Benjamin Otte <otte@gnome.org>
*/
#pragma once
#include "gtkcolumnviewcolumn.h"
G_BEGIN_DECLS
#define GTK_TYPE_COLUMN_VIEW_CELL_WIDGET (gtk_column_view_cell_widget_get_type ())
#define GTK_COLUMN_VIEW_CELL_WIDGET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), GTK_TYPE_COLUMN_VIEW_CELL_WIDGET, GtkColumnViewCellWidget))
#define GTK_COLUMN_VIEW_CELL_WIDGET_CLASS(k) (G_TYPE_CHECK_CLASS_CAST ((k), GTK_TYPE_COLUMN_VIEW_CELL_WIDGET, GtkColumnViewCellWidgetClass))
#define GTK_IS_COLUMN_VIEW_CELL_WIDGET(o) (G_TYPE_CHECK_INSTANCE_TYPE ((o), GTK_TYPE_COLUMN_VIEW_CELL_WIDGET))
#define GTK_IS_COLUMN_VIEW_CELL_WIDGET_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), GTK_TYPE_COLUMN_VIEW_CELL_WIDGET))
#define GTK_COLUMN_VIEW_CELL_WIDGET_GET_CLASS(o) (G_TYPE_INSTANCE_GET_CLASS ((o), GTK_TYPE_COLUMN_VIEW_CELL_WIDGET, GtkColumnViewCellWidgetClass))
typedef struct _GtkColumnViewCellWidget GtkColumnViewCellWidget;
typedef struct _GtkColumnViewCellWidgetClass GtkColumnViewCellWidgetClass;
GType gtk_column_view_cell_widget_get_type (void) G_GNUC_CONST;
GtkWidget * gtk_column_view_cell_widget_new (GtkColumnViewColumn *column);
void gtk_column_view_cell_widget_remove (GtkColumnViewCellWidget *self);
GtkColumnViewCellWidget * gtk_column_view_cell_widget_get_next (GtkColumnViewCellWidget *self);
GtkColumnViewCellWidget * gtk_column_view_cell_widget_get_prev (GtkColumnViewCellWidget *self);
GtkColumnViewColumn * gtk_column_view_cell_widget_get_column (GtkColumnViewCellWidget *self);
G_END_DECLS

26
gtk/gtkcolumnviewcolumn.c
View File

@@ -78,7 +78,7 @@ struct _GtkColumnViewColumn
GMenuModel *menu;
/* This list isn't sorted - this is just caching for performance */
GtkColumnViewCell *first_cell; /* no reference, just caching */
GtkColumnViewCellWidget *first_cell; /* no reference, just caching */
};
struct _GtkColumnViewColumnClass
@@ -400,7 +400,7 @@ gtk_column_view_column_new (const char *title,
return result;
}
GtkColumnViewCell *
GtkColumnViewCellWidget *
gtk_column_view_column_get_first_cell (GtkColumnViewColumn *self)
{
return self->first_cell;
@@ -408,7 +408,7 @@ gtk_column_view_column_get_first_cell (GtkColumnViewColumn *self)
void
gtk_column_view_column_add_cell (GtkColumnViewColumn *self,
GtkColumnViewCell *cell)
GtkColumnViewCellWidget *cell)
{
self->first_cell = cell;
@@ -418,10 +418,10 @@ gtk_column_view_column_add_cell (GtkColumnViewColumn *self,
void
gtk_column_view_column_remove_cell (GtkColumnViewColumn *self,
GtkColumnViewCell *cell)
GtkColumnViewCellWidget *cell)
{
if (cell == self->first_cell)
self->first_cell = gtk_column_view_cell_get_next (cell);
self->first_cell = gtk_column_view_cell_widget_get_next (cell);
gtk_column_view_column_queue_resize (self);
gtk_widget_queue_resize (GTK_WIDGET (cell));
@@ -430,7 +430,7 @@ gtk_column_view_column_remove_cell (GtkColumnViewColumn *self,
void
gtk_column_view_column_queue_resize (GtkColumnViewColumn *self)
{
GtkColumnViewCell *cell;
GtkColumnViewCellWidget *cell;
if (self->minimum_size_request < 0)
return;
@@ -441,7 +441,7 @@ gtk_column_view_column_queue_resize (GtkColumnViewColumn *self)
if (self->header)
gtk_widget_queue_resize (self->header);
for (cell = self->first_cell; cell; cell = gtk_column_view_cell_get_next (cell))
for (cell = self->first_cell; cell; cell = gtk_column_view_cell_widget_get_next (cell))
{
gtk_widget_queue_resize (GTK_WIDGET (cell));
}
@@ -460,7 +460,7 @@ gtk_column_view_column_measure (GtkColumnViewColumn *self,
if (self->minimum_size_request < 0)
{
GtkColumnViewCell *cell;
GtkColumnViewCellWidget *cell;
int min, nat, cell_min, cell_nat;
if (self->header)
@@ -473,7 +473,7 @@ gtk_column_view_column_measure (GtkColumnViewColumn *self,
nat = 0;
}
for (cell = self->first_cell; cell; cell = gtk_column_view_cell_get_next (cell))
for (cell = self->first_cell; cell; cell = gtk_column_view_cell_widget_get_next (cell))
{
gtk_widget_measure (GTK_WIDGET (cell),
GTK_ORIENTATION_HORIZONTAL,
@@ -537,7 +537,7 @@ gtk_column_view_column_create_cells (GtkColumnViewColumn *self)
list_item = GTK_COLUMN_VIEW_ROW_WIDGET (row);
base = GTK_LIST_ITEM_BASE (row);
cell = gtk_column_view_cell_new (self);
cell = gtk_column_view_cell_widget_new (self);
gtk_column_view_row_widget_add_child (list_item, cell);
gtk_list_item_base_update (GTK_LIST_ITEM_BASE (cell),
gtk_list_item_base_get_position (base),
@@ -550,7 +550,7 @@ static void
gtk_column_view_column_remove_cells (GtkColumnViewColumn *self)
{
while (self->first_cell)
gtk_column_view_cell_remove (self->first_cell);
gtk_column_view_cell_widget_remove (self->first_cell);
}
static void
@@ -632,13 +632,13 @@ void
gtk_column_view_column_set_position (GtkColumnViewColumn *self,
guint position)
{
GtkColumnViewCell *cell;
GtkColumnViewCellWidget *cell;
gtk_column_view_row_widget_reorder_child (gtk_column_view_get_header_widget (self->view),
self->header,
position);
for (cell = self->first_cell; cell; cell = gtk_column_view_cell_get_next (cell))
for (cell = self->first_cell; cell; cell = gtk_column_view_cell_widget_get_next (cell))
{
GtkColumnViewRowWidget *list_item;

8
gtk/gtkcolumnviewcolumnprivate.h
View File

@@ -21,7 +21,7 @@
#include "gtk/gtkcolumnviewcolumn.h"
#include "gtk/gtkcolumnviewcellprivate.h"
#include "gtk/gtkcolumnviewcellwidgetprivate.h"
void gtk_column_view_column_set_column_view (GtkColumnViewColumn *self,
@@ -31,10 +31,10 @@ void gtk_column_view_column_set_position (GtkColu
guint position);
void gtk_column_view_column_add_cell (GtkColumnViewColumn *self,
GtkColumnViewCell *cell);
GtkColumnViewCellWidget *cell);
void gtk_column_view_column_remove_cell (GtkColumnViewColumn *self,
GtkColumnViewCell *cell);
GtkColumnViewCell * gtk_column_view_column_get_first_cell (GtkColumnViewColumn *self);
GtkColumnViewCellWidget *cell);
GtkColumnViewCellWidget * gtk_column_view_column_get_first_cell (GtkColumnViewColumn *self);
GtkWidget * gtk_column_view_column_get_header (GtkColumnViewColumn *self);
void gtk_column_view_column_queue_resize (GtkColumnViewColumn *self);

8
gtk/gtkcolumnviewrowwidget.c
View File

@@ -23,7 +23,7 @@
#include "gtkbinlayout.h"
#include "gtkcolumnviewprivate.h"
#include "gtkcolumnviewcellprivate.h"
#include "gtkcolumnviewcellwidgetprivate.h"
#include "gtkcolumnviewcolumnprivate.h"
#include "gtkcolumnviewrowprivate.h"
#include "gtkcolumnviewtitleprivate.h"
@@ -57,8 +57,8 @@ gtk_column_view_row_widget_is_header (GtkColumnViewRowWidget *self)
static GtkColumnViewColumn *
gtk_column_view_row_child_get_column (GtkWidget *child)
{
if (GTK_IS_COLUMN_VIEW_CELL (child))
return gtk_column_view_cell_get_column (GTK_COLUMN_VIEW_CELL (child));
if (GTK_IS_COLUMN_VIEW_CELL_WIDGET (child))
return gtk_column_view_cell_widget_get_column (GTK_COLUMN_VIEW_CELL_WIDGET (child));
else
return gtk_column_view_title_get_column (GTK_COLUMN_VIEW_TITLE (child));
@@ -373,7 +373,7 @@ gtk_column_view_row_widget_root (GtkWidget *widget)
{
GtkWidget *cell;
cell = gtk_column_view_cell_new (column);
cell = gtk_column_view_cell_widget_new (column);
gtk_column_view_row_widget_add_child (self, cell);
gtk_list_item_base_update (GTK_LIST_ITEM_BASE (cell),
gtk_list_item_base_get_position (base),

2
gtk/meson.build
View File

@@ -38,7 +38,7 @@ gtk_private_sources = files([
'gtkcolorpickershell.c',
'gtkcolorscale.c',
'gtkcolorswatch.c',
'gtkcolumnviewcell.c',
'gtkcolumnviewcellwidget.c',
'gtkcolumnviewrowwidget.c',
'gtkcolumnviewtitle.c',
'gtkconstraintexpression.c',

2
po/POTFILES.in
View File

@@ -142,7 +142,7 @@ gtk/gtkcolorplane.c
gtk/gtkcolorscale.c
gtk/gtkcolorswatch.c
gtk/gtkcolumnview.c
gtk/gtkcolumnviewcell.c
gtk/gtkcolumnviewcellwidget.c
gtk/gtkcolumnviewcolumn.c
gtk/gtkcolumnviewtitle.c
gtk/gtkconstraint.c