diff options
| author | Benjamin Otte <otte@redhat.com> | 2020-09-09 15:09:13 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2020-09-09 17:38:37 +0200 |
| commit | 0ad10ccf3993c66a05a3dc623e8bb86b0390a047 (patch) | |
| tree | 8b8ac14252d4359b2b1f0c9d171f1d6216e7339f | |
| parent | 8cb03a8cc079c490029b3ef9c99382a584dde298 (diff) | |
| download | gtk+-0ad10ccf3993c66a05a3dc623e8bb86b0390a047.tar.gz | |
revealer: Refactor code
Assign the values in the same place.
| -rw-r--r-- | gtk/gtkrevealer.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gtk/gtkrevealer.c b/gtk/gtkrevealer.c index ccaaef4143..b921ef6e44 100644 --- a/gtk/gtkrevealer.c +++ b/gtk/gtkrevealer.c @@ -457,8 +457,6 @@ gtk_revealer_size_allocate (GtkWidget *widget, return; } - child_width = width; - child_height = height; hscale = get_child_size_scale (revealer, GTK_ORIENTATION_HORIZONTAL); vscale = get_child_size_scale (revealer, GTK_ORIENTATION_VERTICAL); if (hscale <= 0 || vscale <= 0) @@ -494,11 +492,18 @@ gtk_revealer_size_allocate (GtkWidget *widget, { g_assert (vscale == 1.0); child_width = MIN (100*width, ceil (width / hscale)); + child_height = height; } else if (vscale < 1.0) { + child_width = width; child_height = MIN (100*height, ceil (height / vscale)); } + else + { + child_width = width; + child_height = height; + } transform = NULL; switch (effective_transition (revealer)) |