From 9ce59d747f45abc6dd5dd00901de06571cc90bd6 Mon Sep 17 00:00:00 2001 From: Emil Ernerfeldt Date: Thu, 14 Jan 2021 22:55:26 +0100 Subject: [PATCH] [style] Tweak collapsing header spacing --- egui/src/containers/collapsing_header.rs | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/egui/src/containers/collapsing_header.rs b/egui/src/containers/collapsing_header.rs index 477dec69..e22d15e0 100644 --- a/egui/src/containers/collapsing_header.rs +++ b/egui/src/containers/collapsing_header.rs @@ -179,18 +179,16 @@ impl CollapsingHeader { // TODO: horizontal layout, with icon and text as labels. Insert background behind using Frame. let id = ui.make_persistent_id(id_source); + let button_padding = ui.style().spacing.button_padding; let available = ui.available_rect_before_wrap_finite(); let text_pos = available.min + vec2(ui.style().spacing.indent, 0.0); let galley = label.layout_width(ui, available.right() - text_pos.x); let text_max_x = text_pos.x + galley.size.x; - let desired_width = text_max_x - available.left(); + let desired_width = text_max_x + button_padding.x - available.left(); let desired_width = desired_width.max(available.width()); - let mut desired_size = vec2( - desired_width, - galley.size.y + 2.0 * ui.style().spacing.button_padding.y, - ); + let mut desired_size = vec2(desired_width, galley.size.y + 2.0 * button_padding.y); desired_size = desired_size.at_least(ui.style().spacing.interact_size); let (_, rect) = ui.allocate_space(desired_size);