godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #92647 from passivestar/popup-margins

Browse Source 
Fix popup windows content margins
This commit is contained in:
Rémi Verschelde 2024-06-19 10:10:05 +02:00
commit 5c30858ee1
No known key found for this signature in database
GPG Key ID: C3336907360768E1
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
editor/themes/editor_theme_manager.cpp
View File

@ -393,7 +393,7 @@ EditorThemeManager::ThemeConfiguration EditorThemeManager::_create_theme_config(
config.base_margin = config.base_spacing; config.base_margin = config.base_spacing;
config.increased_margin = config.base_spacing + config.extra_spacing; config.increased_margin = config.base_spacing + config.extra_spacing;
config.separation_margin = (config.base_spacing + config.extra_spacing / 2) * EDSCALE; config.separation_margin = (config.base_spacing + config.extra_spacing / 2) * EDSCALE;
config.popup_margin = config.base_margin * 3 * EDSCALE; config.popup_margin = config.base_margin * 2.4 * EDSCALE;
// Make sure content doesn't stick to window decorations; this can be fixed in future with layout changes. // Make sure content doesn't stick to window decorations; this can be fixed in future with layout changes.
config.window_border_margin = MAX(1, config.base_margin * 2); config.window_border_margin = MAX(1, config.base_margin * 2);
config.top_bar_separation = config.base_margin * 2 * EDSCALE; config.top_bar_separation = config.base_margin * 2 * EDSCALE;
@ -642,6 +642,7 @@ void EditorThemeManager::_create_shared_styles(const Ref<EditorTheme> &p_theme,
p_config.dialog_style = p_config.base_style->duplicate(); p_config.dialog_style = p_config.base_style->duplicate();
p_config.dialog_style->set_corner_radius(CORNER_TOP_LEFT, 0); p_config.dialog_style->set_corner_radius(CORNER_TOP_LEFT, 0);
p_config.dialog_style->set_corner_radius(CORNER_TOP_RIGHT, 0); p_config.dialog_style->set_corner_radius(CORNER_TOP_RIGHT, 0);
p_config.dialog_style->set_content_margin_all(p_config.popup_margin);
// Prevent visible line between window title and body. // Prevent visible line between window title and body.
p_config.dialog_style->set_expand_margin(SIDE_BOTTOM, 2 * EDSCALE); p_config.dialog_style->set_expand_margin(SIDE_BOTTOM, 2 * EDSCALE);
} }