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

Revert "viewport: Actually report the size we're gonna allocate"

Browse Source 
This reverts commit b8468af411.
This commit is contained in:
Benjamin Otte 2021-12-07 23:52:21 +01:00
parent f26cae3838
commit fd0d360f9b
1 changed files with 50 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

98
gtk/gtkviewport.c
View File

@ -143,55 +143,17 @@ gtk_viewport_buildable_init (GtkBuildableIface *iface)
iface->add_child = gtk_viewport_buildable_add_child; iface->add_child = gtk_viewport_buildable_add_child;
} }
static void
gtk_viewport_measure_child (GtkViewport *viewport,
int size[2])
{
GtkOrientation orientation, opposite;
int min, nat;
if (viewport->child == NULL ||
!gtk_widget_is_visible (viewport->child))
{
size[0] = 0;
size[1] = 0;
return;
}
if (gtk_widget_get_request_mode (viewport->child) == GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT)
orientation = GTK_ORIENTATION_VERTICAL;
else
orientation = GTK_ORIENTATION_HORIZONTAL;
opposite = OPPOSITE_ORIENTATION (orientation);
gtk_widget_measure (viewport->child,
orientation, -1,
&min, &nat,
NULL, NULL);
if (viewport->scroll_policy[orientation] == GTK_SCROLL_MINIMUM)
size[orientation] = min;
else
size[orientation] = nat;
gtk_widget_measure (viewport->child,
opposite, size[orientation],
&min, &nat,
NULL, NULL);
if (viewport->scroll_policy[opposite] == GTK_SCROLL_MINIMUM)
size[opposite] = min;
else
size[opposite] = nat;
}
static void static void
viewport_set_adjustment_values (GtkViewport *viewport, viewport_set_adjustment_values (GtkViewport *viewport,
GtkOrientation orientation) GtkOrientation orientation)
{ {
GtkAdjustment *adjustment; GtkAdjustment *adjustment;
GtkScrollablePolicy scroll_policy;
GtkScrollablePolicy other_scroll_policy;
GtkOrientation other_orientation;
double upper, value; double upper, value;
int viewport_size; int viewport_size, other_viewport_size;
int view_width, view_height; int view_width, view_height;
int child_size[2];
view_width = gtk_widget_get_width (GTK_WIDGET (viewport)); view_width = gtk_widget_get_width (GTK_WIDGET (viewport));
view_height = gtk_widget_get_height (GTK_WIDGET (viewport)); view_height = gtk_widget_get_height (GTK_WIDGET (viewport));
@ -199,17 +161,49 @@ viewport_set_adjustment_values (GtkViewport *viewport,
if (orientation == GTK_ORIENTATION_HORIZONTAL) if (orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
adjustment = viewport->adjustment[GTK_ORIENTATION_HORIZONTAL]; adjustment = viewport->adjustment[GTK_ORIENTATION_HORIZONTAL];
other_orientation = GTK_ORIENTATION_VERTICAL;
viewport_size = view_width; viewport_size = view_width;
other_viewport_size = view_height;
scroll_policy = viewport->scroll_policy[GTK_ORIENTATION_HORIZONTAL];
other_scroll_policy = viewport->scroll_policy[GTK_ORIENTATION_VERTICAL];
} }
else /* VERTICAL */ else /* VERTICAL */
{ {
adjustment = viewport->adjustment[GTK_ORIENTATION_VERTICAL]; adjustment = viewport->adjustment[GTK_ORIENTATION_VERTICAL];
other_orientation = GTK_ORIENTATION_HORIZONTAL;
viewport_size = view_height; viewport_size = view_height;
other_viewport_size = view_width;
scroll_policy = viewport->scroll_policy[GTK_ORIENTATION_VERTICAL];
other_scroll_policy = viewport->scroll_policy[GTK_ORIENTATION_HORIZONTAL];
} }
gtk_viewport_measure_child (viewport, child_size);
upper = MAX (viewport_size, child_size[orientation]); if (viewport->child && gtk_widget_get_visible (viewport->child))
{
int min_size, nat_size;
int scroll_size;
if (other_scroll_policy == GTK_SCROLL_MINIMUM)
gtk_widget_measure (viewport->child, other_orientation, -1,
&scroll_size, NULL, NULL, NULL);
else
gtk_widget_measure (viewport->child, other_orientation, -1,
NULL, &scroll_size, NULL, NULL);
gtk_widget_measure (viewport->child, orientation,
MAX (other_viewport_size, scroll_size),
&min_size, &nat_size, NULL, NULL);
if (scroll_policy == GTK_SCROLL_MINIMUM)
upper = MAX (min_size, viewport_size);
else
upper = MAX (nat_size, viewport_size);
}
else
{
upper = viewport_size;
}
value = gtk_adjustment_get_value (adjustment); value = gtk_adjustment_get_value (adjustment);
@ -242,12 +236,13 @@ gtk_viewport_measure (GtkWidget *widget,
int *natural_baseline) int *natural_baseline)
{ {
GtkViewport *viewport = GTK_VIEWPORT (widget); GtkViewport *viewport = GTK_VIEWPORT (widget);
int child_size[2];
gtk_viewport_measure_child (viewport, child_size); if (viewport->child)
gtk_widget_measure (viewport->child,
*minimum = child_size[orientation]; orientation,
*natural = child_size[orientation]; for_size,
minimum, natural,
NULL, NULL);
} }
static void static void
@ -272,6 +267,11 @@ gtk_viewport_compute_expand (GtkWidget *widget,
static GtkSizeRequestMode static GtkSizeRequestMode
gtk_viewport_get_request_mode (GtkWidget *widget) gtk_viewport_get_request_mode (GtkWidget *widget)
{ {
GtkViewport *viewport = GTK_VIEWPORT (widget);
if (viewport->child)
return gtk_widget_get_request_mode (viewport->child);
else
return GTK_SIZE_REQUEST_CONSTANT_SIZE; return GTK_SIZE_REQUEST_CONSTANT_SIZE;
} }