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

headerbar: Duct-tape over the measure mess

Browse Source 
Fixes various reftests.

The headerbar needs soeone to redo sizing.
This commit is contained in:
Benjamin Otte
2019-03-29 03:31:04 +01:00
parent 9ca5495380
commit 38fbb6856c
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/gtkheaderbar.c
View File

@@ -879,12 +879,18 @@ gtk_header_bar_measure (GtkWidget *widget,
int *minimum_baseline,
int *natural_baseline)
{
int min, nat;
gtk_header_bar_get_size (widget, orientation, &min, &nat);
if (for_size < 0)
gtk_header_bar_get_size (widget, orientation, minimum, natural);
*natural = nat;
else if (orientation == GTK_ORIENTATION_HORIZONTAL)
gtk_header_bar_compute_size_for_orientation (widget, for_size, minimum, natural);
else
gtk_header_bar_compute_size_for_opposing_orientation (widget, for_size, minimum, natural);
*minimum = MAX (*minimum, min);
*natural = MAX (*natural, min);
}
static void