AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-26 13:41:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'wip/otte/for-master' into 'master'

Browse Source 
spinner: Behave like any other icon

See merge request GNOME/gtk!3677
This commit is contained in:
Benjamin Otte 2021-06-17 11:47:28 +00:00
commit e59e9ad6a9
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkspinner.c
View File

@ -91,20 +91,10 @@ gtk_spinner_measure (GtkWidget *widget,
int *minimum_baseline, int *minimum_baseline,
int *natural_baseline) int *natural_baseline)
{ {
double min_size;
GtkCssStyle *style; GtkCssStyle *style;
style = gtk_css_node_get_style (gtk_widget_get_css_node (widget)); style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
*minimum = *natural = _gtk_css_number_value_get (style->icon->icon_size, 100);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
min_size = _gtk_css_number_value_get (style->size->min_width, 100);
else
min_size = _gtk_css_number_value_get (style->size->min_height, 100);
if (min_size > 0.0)
*minimum = *natural = min_size;
else
*minimum = *natural = DEFAULT_SIZE;
} }
static void static void