diff --git a/rinkplanner/scenes/whiteboard/whiteboard.tscn b/rinkplanner/scenes/whiteboard/whiteboard.tscn index 130ee74..2aa0d66 100644 --- a/rinkplanner/scenes/whiteboard/whiteboard.tscn +++ b/rinkplanner/scenes/whiteboard/whiteboard.tscn @@ -769,6 +769,7 @@ theme_override_constants/separation = 6 unique_name_in_owner = true layout_mode = 2 size_flags_horizontal = 3 +clip_text = true theme_override_colors/font_color = Color(0.580392, 0.639216, 0.721569, 1) theme_override_font_sizes/font_size = 15 text = "Abschnitt 1 · 0 Segmente" @@ -784,25 +785,25 @@ tooltip_text = "Hilfe und Annahmen" [node name="SeasonOption" type="OptionButton" parent="Layout/StatusBar/StatusBarContent"] unique_name_in_owner = true -custom_minimum_size = Vector2(190, 48) +custom_minimum_size = Vector2(158, 48) layout_mode = 2 theme_override_font_sizes/font_size = 15 [node name="ProgramOption" type="OptionButton" parent="Layout/StatusBar/StatusBarContent"] unique_name_in_owner = true -custom_minimum_size = Vector2(120, 48) +custom_minimum_size = Vector2(104, 48) layout_mode = 2 theme_override_font_sizes/font_size = 15 [node name="AdultCategoryOption" type="OptionButton" parent="Layout/StatusBar/StatusBarContent"] unique_name_in_owner = true -custom_minimum_size = Vector2(170, 48) +custom_minimum_size = Vector2(146, 48) layout_mode = 2 theme_override_font_sizes/font_size = 15 [node name="ValidationButton" type="Button" parent="Layout/StatusBar/StatusBarContent"] unique_name_in_owner = true -custom_minimum_size = Vector2(120, 48) +custom_minimum_size = Vector2(104, 48) layout_mode = 2 theme_override_font_sizes/font_size = 15 text = "Prüfen" diff --git a/rinkplanner/src/whiteboard/ctrl/whiteboard_controller.gd b/rinkplanner/src/whiteboard/ctrl/whiteboard_controller.gd index 0f11611..0253195 100644 --- a/rinkplanner/src/whiteboard/ctrl/whiteboard_controller.gd +++ b/rinkplanner/src/whiteboard/ctrl/whiteboard_controller.gd @@ -5574,6 +5574,10 @@ func _apply_display_scale() -> void: var factor := maxf(1.0, DisplayServer.screen_get_scale()) if not is_equal_approx(window.content_scale_factor, factor): window.content_scale_factor = factor + # The viewport size changes with the scale factor, but only after the + # next frame. Without the deferred pass the compact layout would be + # decided from the pixel width and the bars would overflow on tablets. + _apply_responsive_layout.call_deferred() func _apply_responsive_layout() -> void: