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

Merge branch 'matthiasc/for-master' into 'master'

Browse Source 
Matthiasc/for master

Closes #3180, #3178, and #3179

See merge request GNOME/gtk!2618
This commit is contained in:
Matthias Clasen 2020-09-24 18:50:26 +00:00
commit e6d5a3c4e8
5 changed files with 112 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
gtk/gtkcolumnviewcell.c
View File

@ -25,6 +25,9 @@
#include "gtkintl.h"
#include "gtklistitemwidgetprivate.h"
#include "gtkwidgetprivate.h"
#include "gtkcssnodeprivate.h"
#include "gtkcssnumbervalueprivate.h"
struct _GtkColumnViewCell
{
@ -44,6 +47,37 @@ struct _GtkColumnViewCellClass
G_DEFINE_TYPE (GtkColumnViewCell, gtk_column_view_cell, GTK_TYPE_LIST_ITEM_WIDGET)
static int
get_number (GtkCssValue *value)
{
double d = _gtk_css_number_value_get (value, 100);
if (d < 1)
return ceil (d);
else
return floor (d);
}
static int
unadjust_width (GtkWidget *widget,
int width)
{
GtkCssStyle *style;
int widget_margins;
int css_extra;
style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
css_extra = get_number (style->size->margin_left) +
get_number (style->size->margin_right) +
get_number (style->border->border_left_width) +
get_number (style->border->border_right_width) +
get_number (style->size->padding_left) +
get_number (style->size->padding_right);
widget_margins = widget->priv->margin.left + widget->priv->margin.right;
return MAX (0, width - widget_margins - css_extra);
}
static void
gtk_column_view_cell_measure (GtkWidget *widget,
GtkOrientation orientation,
@ -56,15 +90,18 @@ gtk_column_view_cell_measure (GtkWidget *widget,
GtkColumnViewCell *cell = GTK_COLUMN_VIEW_CELL (widget);
GtkWidget *child = gtk_widget_get_first_child (widget);
int fixed_width = gtk_column_view_column_get_fixed_width (cell->column);
int unadj_width;
unadj_width = unadjust_width (widget, fixed_width);
if (orientation == GTK_ORIENTATION_VERTICAL)
{
if (fixed_width > -1)
{
if (for_size == -1)
for_size = fixed_width;
for_size = unadj_width;
else
for_size = MIN (for_size, fixed_width);
for_size = MIN (for_size, unadj_width);
}
}
@ -74,7 +111,10 @@ gtk_column_view_cell_measure (GtkWidget *widget,
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
if (fixed_width > -1)
*minimum = *natural = fixed_width;
{
*minimum = 0;
*natural = unadj_width;
}
}
}
@ -84,10 +124,16 @@ gtk_column_view_cell_size_allocate (GtkWidget *widget,
int height,
int baseline)
{
GtkColumnViewCell *self = GTK_COLUMN_VIEW_CELL (widget);
GtkWidget *child = gtk_widget_get_first_child (widget);
if (child)
gtk_widget_allocate (child, width, height, baseline, NULL);
{
if (gtk_column_view_column_get_fixed_width (self->column) > -1)
gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL, height, NULL, &width, NULL, NULL);
gtk_widget_allocate (child, width, height, baseline, NULL);
}
}
static void
@ -175,6 +221,7 @@ gtk_column_view_cell_init (GtkColumnViewCell *self)
GtkWidget *widget = GTK_WIDGET (self);
gtk_widget_set_focusable (widget, FALSE);
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;

18
gtk/gtkcolumnviewcolumn.c
View File

@ -994,8 +994,6 @@ void
gtk_column_view_column_set_fixed_width (GtkColumnViewColumn *self,
int fixed_width)
{
GtkOverflow overflow;
g_return_if_fail (GTK_IS_COLUMN_VIEW_COLUMN (self));
g_return_if_fail (fixed_width >= -1);
@ -1004,22 +1002,6 @@ gtk_column_view_column_set_fixed_width (GtkColumnViewColumn *self,
self->fixed_width = fixed_width;
if (fixed_width > -1)
overflow = GTK_OVERFLOW_HIDDEN;
else
overflow = GTK_OVERFLOW_VISIBLE;
if (self->header &&
overflow != gtk_widget_get_overflow (GTK_WIDGET (self->header)))
{
GtkColumnViewCell *cell;
gtk_widget_set_overflow (GTK_WIDGET (self->header), overflow);
for (cell = self->first_cell; cell; cell = gtk_column_view_cell_get_next (cell))
gtk_widget_set_overflow (GTK_WIDGET (cell), overflow);
}
gtk_column_view_column_queue_resize (self);
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_FIXED_WIDTH]);

6
gtk/gtkcolumnviewlayout.c
View File

@ -128,7 +128,7 @@ gtk_column_view_layout_allocate (GtkLayoutManager *layout_manager,
child = _gtk_widget_get_next_sibling (child))
{
GtkColumnViewColumn *column;
int col_x, col_width;
int col_x, col_width, min;
if (!gtk_widget_should_layout (child))
continue;
@ -144,7 +144,9 @@ gtk_column_view_layout_allocate (GtkLayoutManager *layout_manager,
gtk_column_view_column_get_header_allocation (column, &col_x, &col_width);
}
gtk_widget_size_allocate (child, &(GtkAllocation) { col_x, 0, col_width, height }, baseline);
gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL, -1, &min, NULL, NULL, NULL);
gtk_widget_size_allocate (child, &(GtkAllocation) { col_x, 0, MAX (min, col_width), height }, baseline);
}
}

54
gtk/gtkcolumnviewtitle.c
View File

@ -32,6 +32,8 @@
#include "gtkgestureclick.h"
#include "gtkpopovermenu.h"
#include "gtknative.h"
#include "gtkcssnodeprivate.h"
#include "gtkcssnumbervalueprivate.h"
struct _GtkColumnViewTitle
{
@ -52,6 +54,37 @@ struct _GtkColumnViewTitleClass
G_DEFINE_TYPE (GtkColumnViewTitle, gtk_column_view_title, GTK_TYPE_WIDGET)
static int
get_number (GtkCssValue *value)
{
double d = _gtk_css_number_value_get (value, 100);
if (d < 1)
return ceil (d);
else
return floor (d);
}
static int
unadjust_width (GtkWidget *widget,
int width)
{
GtkCssStyle *style;
int widget_margins;
int css_extra;
style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
css_extra = get_number (style->size->margin_left) +
get_number (style->size->margin_right) +
get_number (style->border->border_left_width) +
get_number (style->border->border_right_width) +
get_number (style->size->padding_left) +
get_number (style->size->padding_right);
widget_margins = widget->priv->margin.left + widget->priv->margin.right;
return MAX (0, width - widget_margins - css_extra);
}
static void
gtk_column_view_title_measure (GtkWidget *widget,
GtkOrientation orientation,
@ -64,15 +97,18 @@ gtk_column_view_title_measure (GtkWidget *widget,
GtkColumnViewTitle *self = GTK_COLUMN_VIEW_TITLE (widget);
GtkWidget *child = gtk_widget_get_first_child (widget);
int fixed_width = gtk_column_view_column_get_fixed_width (self->column);
int unadj_width;
unadj_width = unadjust_width (widget, fixed_width);
if (orientation == GTK_ORIENTATION_VERTICAL)
{
if (fixed_width > -1)
{
if (for_size == -1)
for_size = fixed_width;
for_size = unadj_width;
else
for_size = MIN (for_size, fixed_width);
for_size = MIN (for_size, unadj_width);
}
}
@ -82,7 +118,10 @@ gtk_column_view_title_measure (GtkWidget *widget,
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
if (fixed_width > -1)
*minimum = *natural = fixed_width;
{
*minimum = 0;
*natural = unadj_width;
}
}
}
@ -96,7 +135,12 @@ gtk_column_view_title_size_allocate (GtkWidget *widget,
GtkWidget *child = gtk_widget_get_first_child (widget);
if (child)
gtk_widget_allocate (child, width, height, baseline, NULL);
{
if (gtk_column_view_column_get_fixed_width (self->column) > -1)
gtk_widget_measure (child, GTK_ORIENTATION_HORIZONTAL, height, NULL, &width, NULL, NULL);
gtk_widget_allocate (child, width, height, baseline, NULL);
}
if (self->popup_menu)
gtk_native_check_resize (GTK_NATIVE (self->popup_menu));
@ -212,6 +256,8 @@ gtk_column_view_title_init (GtkColumnViewTitle *self)
widget->priv->resize_func = gtk_column_view_title_resize_func;
gtk_widget_set_overflow (widget, GTK_OVERFLOW_HIDDEN);
self->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_parent (self->box, widget);

11
gtk/gtklistitemwidget.c
View File

@ -629,10 +629,13 @@ gtk_list_item_widget_reorder_child (GtkListItemWidget *self,
}
}
gtk_widget_insert_after (child, widget, sibling);
gtk_css_node_insert_after (gtk_widget_get_css_node (widget),
gtk_widget_get_css_node (child),
sibling ? gtk_widget_get_css_node (sibling) : NULL);
if (child != sibling)
{
gtk_widget_insert_after (child, widget, sibling);
gtk_css_node_insert_after (gtk_widget_get_css_node (widget),
gtk_widget_get_css_node (child),
sibling ? gtk_widget_get_css_node (sibling) : NULL);
}
}
void