Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #104317 from pafuent/fixing_wrong_focus_style_clipping_on_scroll_container

Browse source 
Fix `ScrollContainer` focus border issue
This commit is contained in:
Thaddeus Crews 2025-04-15 12:28:50 -05:00
commit 039d9ffd30
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
5 changed files with 98 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
editor/themes/editor_theme_manager.cpp
View file

@ -1888,8 +1888,6 @@ void EditorThemeManager::_populate_editor_styles(const Ref<EditorTheme> &p_theme
p_theme->set_stylebox("FocusViewport", EditorStringName(EditorStyles), style_widget_focus_viewport);
Ref<StyleBoxFlat> style_widget_scroll_container = p_config.button_style_focus->duplicate();
// Make the focus outline appear to be flush with the buttons it's focusing, so not draw on top of the content.
style_widget_scroll_container->set_expand_margin_all(4);
p_theme->set_stylebox("focus", "ScrollContainer", style_widget_scroll_container);
// This stylebox is used in 3d and 2d viewports (no borders).
@ -2241,6 +2239,12 @@ void EditorThemeManager::_populate_editor_styles(const Ref<EditorTheme> &p_theme
// Editor inspector.
{
// Panel.
Ref<StyleBoxFlat> editor_inspector_panel = p_config.tree_panel_style->duplicate();
editor_inspector_panel->set_border_width_all(0);
editor_inspector_panel->set_content_margin_all(0);
p_theme->set_stylebox(SceneStringName(panel), "EditorInspector", editor_inspector_panel);
// Vertical separation between inspector categories and sections.
p_theme->set_constant("v_separation", "EditorInspector", 0);