godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-07 12:30:27 +00:00
Code Releases Wiki Activity

Introduce editor theme spacing presets

Browse Source 
This change adds a new editor setting related to theming
which controls base and additional spacing used in the
generated editor theme. These values can also be changed
manually by the user to customize their experience.

Limited effort was applied to make sure both Compact and
Spacious presets work and look fine, but further tuning
and adjustments are totally expected. Some controls will
require layout changes or additional fixes to their constants.
This commit is contained in:
Yuri Sizov
2024-01-15 13:14:55 +01:00
parent 635b8a1474
commit dc3b07e551
7 changed files with 155 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
doc/classes/EditorSettings.xml
View File

@@ -662,12 +662,16 @@
<member name="interface/theme/accent_color" type="Color" setter="" getter=""> <member name="interface/theme/accent_color" type="Color" setter="" getter="">
The color to use for "highlighted" user interface elements in the editor (pressed and hovered items). The color to use for "highlighted" user interface elements in the editor (pressed and hovered items).
</member> </member>
<member name="interface/theme/additional_spacing" type="float" setter="" getter=""> <member name="interface/theme/additional_spacing" type="int" setter="" getter="">
The spacing to add for buttons and list items in the editor (in pixels). Increasing this value is useful to improve usability on touch screens, at the cost of reducing the amount of usable screen real estate. The extra spacing to add to various GUI elements in the editor (in pixels). Increasing this value is useful to improve usability on touch screens, at the cost of reducing the amount of usable screen real estate.
See also [member interface/theme/spacing_preset].
</member> </member>
<member name="interface/theme/base_color" type="Color" setter="" getter=""> <member name="interface/theme/base_color" type="Color" setter="" getter="">
The base color to use for user interface elements in the editor. Secondary colors (such as darker/lighter variants) are derived from this color. The base color to use for user interface elements in the editor. Secondary colors (such as darker/lighter variants) are derived from this color.
</member> </member>
<member name="interface/theme/base_spacing" type="int" setter="" getter="">
The base spacing used by various GUI elements in the editor (in pixels). See also [member interface/theme/spacing_preset].
</member>
<member name="interface/theme/border_size" type="int" setter="" getter=""> <member name="interface/theme/border_size" type="int" setter="" getter="">
The border size to use for interface elements (in pixels). The border size to use for interface elements (in pixels).
</member> </member>
@@ -699,6 +703,9 @@
<member name="interface/theme/relationship_line_opacity" type="float" setter="" getter=""> <member name="interface/theme/relationship_line_opacity" type="float" setter="" getter="">
The opacity to use when drawing relationship lines in the editor's [Tree]-based GUIs (such as the Scene tree dock). The opacity to use when drawing relationship lines in the editor's [Tree]-based GUIs (such as the Scene tree dock).
</member> </member>
<member name="interface/theme/spacing_preset" type="String" setter="" getter="">
The editor theme spacing preset to use. See also [member interface/theme/base_spacing] and [member interface/theme/additional_spacing].
</member>
<member name="interface/touchscreen/enable_long_press_as_right_click" type="bool" setter="" getter=""> <member name="interface/touchscreen/enable_long_press_as_right_click" type="bool" setter="" getter="">
If [code]true[/code], long press on touchscreen is treated as right click. If [code]true[/code], long press on touchscreen is treated as right click.
[b]Note:[/b] Defaults to [code]true[/code] on touchscreen devices. [b]Note:[/b] Defaults to [code]true[/code] on touchscreen devices.

4
editor/editor_settings.cpp
View File

@@ -460,6 +460,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
// Theme // Theme
EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_ENUM, "interface/theme/preset", "Default", "Default,Breeze Dark,Godot 2,Gray,Light,Solarized (Dark),Solarized (Light),Black (OLED),Custom") EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_ENUM, "interface/theme/preset", "Default", "Default,Breeze Dark,Godot 2,Gray,Light,Solarized (Dark),Solarized (Light),Black (OLED),Custom")
EDITOR_SETTING(Variant::STRING, PROPERTY_HINT_ENUM, "interface/theme/spacing_preset", "Default", "Compact,Default,Spacious,Custom")
EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/theme/icon_and_font_color", 0, "Auto,Dark,Light") EDITOR_SETTING(Variant::INT, PROPERTY_HINT_ENUM, "interface/theme/icon_and_font_color", 0, "Auto,Dark,Light")
EDITOR_SETTING(Variant::COLOR, PROPERTY_HINT_NONE, "interface/theme/base_color", Color(0.2, 0.23, 0.31), "") EDITOR_SETTING(Variant::COLOR, PROPERTY_HINT_NONE, "interface/theme/base_color", Color(0.2, 0.23, 0.31), "")
EDITOR_SETTING(Variant::COLOR, PROPERTY_HINT_NONE, "interface/theme/accent_color", Color(0.41, 0.61, 0.91), "") EDITOR_SETTING(Variant::COLOR, PROPERTY_HINT_NONE, "interface/theme/accent_color", Color(0.41, 0.61, 0.91), "")
@@ -469,7 +470,8 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/theme/relationship_line_opacity", 0.1, "0.00,1,0.01") EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/theme/relationship_line_opacity", 0.1, "0.00,1,0.01")
EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/theme/border_size", 0, "0,2,1") EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/theme/border_size", 0, "0,2,1")
EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/theme/corner_radius", 3, "0,6,1") EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/theme/corner_radius", 3, "0,6,1")
EDITOR_SETTING(Variant::FLOAT, PROPERTY_HINT_RANGE, "interface/theme/additional_spacing", 0.0, "0,5,0.1") EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/theme/base_spacing", 4, "0,8,1")
EDITOR_SETTING(Variant::INT, PROPERTY_HINT_RANGE, "interface/theme/additional_spacing", 0, "0,8,1")
EDITOR_SETTING_USAGE(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/theme/custom_theme", "", "*.res,*.tres,*.theme", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED) EDITOR_SETTING_USAGE(Variant::STRING, PROPERTY_HINT_GLOBAL_FILE, "interface/theme/custom_theme", "", "*.res,*.tres,*.theme", PROPERTY_USAGE_DEFAULT | PROPERTY_USAGE_RESTART_IF_CHANGED)
// Touchscreen // Touchscreen

6
editor/editor_settings_dialog.cpp
View File

@@ -62,8 +62,12 @@ void EditorSettingsDialog::_settings_changed() {
void EditorSettingsDialog::_settings_property_edited(const String &p_name) { void EditorSettingsDialog::_settings_property_edited(const String &p_name) {
String full_name = inspector->get_full_item_path(p_name); String full_name = inspector->get_full_item_path(p_name);
// Set theme presets to Custom when controlled settings change.
if (full_name == "interface/theme/accent_color" || full_name == "interface/theme/base_color" || full_name == "interface/theme/contrast" || full_name == "interface/theme/draw_extra_borders") { if (full_name == "interface/theme/accent_color" || full_name == "interface/theme/base_color" || full_name == "interface/theme/contrast" || full_name == "interface/theme/draw_extra_borders") {
EditorSettings::get_singleton()->set_manually("interface/theme/preset", "Custom"); // set preset to Custom EditorSettings::get_singleton()->set_manually("interface/theme/preset", "Custom");
} else if (full_name == "interface/theme/base_spacing" || full_name == "interface/theme/additional_spacing") {
EditorSettings::get_singleton()->set_manually("interface/theme/spacing_preset", "Custom");
} else if (full_name.begins_with("text_editor/theme/highlighting")) { } else if (full_name.begins_with("text_editor/theme/highlighting")) {
EditorSettings::get_singleton()->set_manually("text_editor/theme/color_theme", "Custom"); EditorSettings::get_singleton()->set_manually("text_editor/theme/color_theme", "Custom");
} }

2
editor/icons/GuiHsplitter.svg
View File

@@ -1 +1 @@
<svg height="64" viewBox="0 0 8 64" width="8" xmlns="http://www.w3.org/2000/svg"><path d="M4 2v60" fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2"/></svg> <svg height="64" viewBox="0 0 2 64" width="2" xmlns="http://www.w3.org/2000/svg"><path d="M1 2v60" fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 193 B

After

Width:  |  Height:  |  Size: 193 B

2
editor/icons/GuiVsplitter.svg
View File

@@ -1 +1 @@
<svg height="8" viewBox="0 0 64 8" width="64" xmlns="http://www.w3.org/2000/svg"><path d="M2 4h60" fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2"/></svg> <svg height="2" viewBox="0 0 64 2" width="64" xmlns="http://www.w3.org/2000/svg"><path d="M2 1h60" fill="none" stroke="#fff" stroke-linecap="round" stroke-opacity=".4" stroke-width="2"/></svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 193 B

After

Width:  |  Height:  |  Size: 193 B

119
editor/themes/editor_theme_manager.cpp
View File

@@ -151,6 +151,7 @@ EditorThemeManager::ThemeConfiguration EditorThemeManager::_create_theme_config(
// Basic properties. // Basic properties.
config.preset = EDITOR_GET("interface/theme/preset"); config.preset = EDITOR_GET("interface/theme/preset");
config.spacing_preset = EDITOR_GET("interface/theme/spacing_preset");
config.dark_theme = EditorSettings::get_singleton()->is_dark_theme(); config.dark_theme = EditorSettings::get_singleton()->is_dark_theme();
config.base_color = EDITOR_GET("interface/theme/base_color"); config.base_color = EDITOR_GET("interface/theme/base_color");
@@ -160,6 +161,7 @@ EditorThemeManager::ThemeConfiguration EditorThemeManager::_create_theme_config(
// Extra properties. // Extra properties.
config.base_spacing = EDITOR_GET("interface/theme/base_spacing");
config.extra_spacing = EDITOR_GET("interface/theme/additional_spacing"); config.extra_spacing = EDITOR_GET("interface/theme/additional_spacing");
// Ensure borders are visible when using an editor scale below 100%. // Ensure borders are visible when using an editor scale below 100%.
config.border_width = CLAMP((int)EDITOR_GET("interface/theme/border_size"), 0, 2) * MAX(1, EDSCALE); config.border_width = CLAMP((int)EDITOR_GET("interface/theme/border_size"), 0, 2) * MAX(1, EDSCALE);
@@ -175,19 +177,8 @@ EditorThemeManager::ThemeConfiguration EditorThemeManager::_create_theme_config(
config.default_contrast = 0.3; // Make sure to keep this in sync with the editor settings definition. config.default_contrast = 0.3; // Make sure to keep this in sync with the editor settings definition.
// Generated properties. // Handle main theme preset.
{
config.base_margin = 4;
config.increased_margin = config.base_margin + config.extra_spacing;
config.popup_margin = config.base_margin * 3 * EDSCALE;
config.window_border_margin = config.base_margin * 2;
config.top_bar_separation = config.base_margin * 2 * EDSCALE;
// Force the v_separation to be even so that the spacing on top and bottom is even.
// If the vsep is odd and cannot be split into 2 even groups (of pixels), then it will be lopsided.
// We add 2 to the vsep to give it some extra spacing which looks a bit more modern (see Windows, for example).
const int separation_base = config.increased_margin + 6;
config.forced_even_separation = separation_base + (separation_base % 2);
if (config.preset != "Custom") { if (config.preset != "Custom") {
Color preset_accent_color; Color preset_accent_color;
Color preset_base_color; Color preset_base_color;
@@ -250,6 +241,53 @@ EditorThemeManager::ThemeConfiguration EditorThemeManager::_create_theme_config(
EditorSettings::get_singleton()->set_manually("interface/theme/base_color", config.base_color); EditorSettings::get_singleton()->set_manually("interface/theme/base_color", config.base_color);
EditorSettings::get_singleton()->set_manually("interface/theme/contrast", config.contrast); EditorSettings::get_singleton()->set_manually("interface/theme/contrast", config.contrast);
EditorSettings::get_singleton()->set_manually("interface/theme/draw_extra_borders", config.draw_extra_borders); EditorSettings::get_singleton()->set_manually("interface/theme/draw_extra_borders", config.draw_extra_borders);
}
// Handle theme spacing preset.
{
if (config.spacing_preset != "Custom") {
int preset_base_spacing = 0;
int preset_extra_spacing = 0;
if (config.spacing_preset == "Compact") {
preset_base_spacing = 0;
preset_extra_spacing = 4;
} else if (config.spacing_preset == "Spacious") {
preset_base_spacing = 6;
preset_extra_spacing = 2;
} else { // Default
preset_base_spacing = 4;
preset_extra_spacing = 0;
}
config.base_spacing = preset_base_spacing;
config.extra_spacing = preset_extra_spacing;
EditorSettings::get_singleton()->set_initial_value("interface/theme/base_spacing", config.base_spacing);
EditorSettings::get_singleton()->set_initial_value("interface/theme/additional_spacing", config.extra_spacing);
}
// Enforce values in case they were adjusted or overridden.
EditorSettings::get_singleton()->set_manually("interface/theme/spacing_preset", config.spacing_preset);
EditorSettings::get_singleton()->set_manually("interface/theme/base_spacing", config.base_spacing);
EditorSettings::get_singleton()->set_manually("interface/theme/additional_spacing", config.extra_spacing);
}
// Generated properties.
config.base_margin = config.base_spacing;
config.increased_margin = config.base_spacing + config.extra_spacing;
config.separation_margin = (config.base_spacing + config.extra_spacing / 2) * EDSCALE;
config.popup_margin = config.base_margin * 3 * EDSCALE;
// 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.top_bar_separation = config.base_margin * 2 * EDSCALE;
// Force the v_separation to be even so that the spacing on top and bottom is even.
// If the vsep is odd and cannot be split into 2 even groups (of pixels), then it will be lopsided.
// We add 2 to the vsep to give it some extra spacing which looks a bit more modern (see Windows, for example).
const int separation_base = config.increased_margin + 6;
config.forced_even_separation = separation_base + (separation_base % 2);
return config; return config;
} }
@@ -786,14 +824,14 @@ void EditorThemeManager::_populate_standard_styles(const Ref<Theme> &p_theme, Th
p_theme->set_color("title_button_color", "Tree", p_config.font_color); p_theme->set_color("title_button_color", "Tree", p_config.font_color);
p_theme->set_color("drop_position_color", "Tree", p_config.accent_color); p_theme->set_color("drop_position_color", "Tree", p_config.accent_color);
p_theme->set_constant("v_separation", "Tree", p_config.widget_margin.y - EDSCALE); p_theme->set_constant("v_separation", "Tree", p_config.separation_margin);
p_theme->set_constant("h_separation", "Tree", 6 * EDSCALE); p_theme->set_constant("h_separation", "Tree", (p_config.increased_margin + 2) * EDSCALE);
p_theme->set_constant("guide_width", "Tree", p_config.border_width); p_theme->set_constant("guide_width", "Tree", p_config.border_width);
p_theme->set_constant("item_margin", "Tree", 3 * p_config.base_margin * EDSCALE); p_theme->set_constant("item_margin", "Tree", 3 * p_config.increased_margin * EDSCALE);
p_theme->set_constant("inner_item_margin_bottom", "Tree", p_config.increased_margin * EDSCALE); p_theme->set_constant("inner_item_margin_top", "Tree", p_config.separation_margin);
p_theme->set_constant("inner_item_margin_bottom", "Tree", p_config.separation_margin);
p_theme->set_constant("inner_item_margin_left", "Tree", p_config.increased_margin * EDSCALE); p_theme->set_constant("inner_item_margin_left", "Tree", p_config.increased_margin * EDSCALE);
p_theme->set_constant("inner_item_margin_right", "Tree", p_config.increased_margin * EDSCALE); p_theme->set_constant("inner_item_margin_right", "Tree", p_config.increased_margin * EDSCALE);
p_theme->set_constant("inner_item_margin_top", "Tree", p_config.increased_margin * EDSCALE);
p_theme->set_constant("button_margin", "Tree", p_config.base_margin * EDSCALE); p_theme->set_constant("button_margin", "Tree", p_config.base_margin * EDSCALE);
p_theme->set_constant("scroll_border", "Tree", 40 * EDSCALE); p_theme->set_constant("scroll_border", "Tree", 40 * EDSCALE);
p_theme->set_constant("scroll_speed", "Tree", 12); p_theme->set_constant("scroll_speed", "Tree", 12);
@@ -855,6 +893,7 @@ void EditorThemeManager::_populate_standard_styles(const Ref<Theme> &p_theme, Th
// ItemList. // ItemList.
{ {
Ref<StyleBoxFlat> style_itemlist_bg = p_config.base_style->duplicate(); Ref<StyleBoxFlat> style_itemlist_bg = p_config.base_style->duplicate();
style_itemlist_bg->set_content_margin_all(p_config.separation_margin);
style_itemlist_bg->set_bg_color(p_config.dark_color_1); style_itemlist_bg->set_bg_color(p_config.dark_color_1);
if (p_config.draw_extra_borders) { if (p_config.draw_extra_borders) {
@@ -887,9 +926,9 @@ void EditorThemeManager::_populate_standard_styles(const Ref<Theme> &p_theme, Th
p_theme->set_color("font_outline_color", "ItemList", p_config.font_outline_color); p_theme->set_color("font_outline_color", "ItemList", p_config.font_outline_color);
p_theme->set_color("guide_color", "ItemList", guide_color); p_theme->set_color("guide_color", "ItemList", guide_color);
p_theme->set_constant("v_separation", "ItemList", p_config.forced_even_separation * 0.5 * EDSCALE); p_theme->set_constant("v_separation", "ItemList", p_config.forced_even_separation * 0.5 * EDSCALE);
p_theme->set_constant("h_separation", "ItemList", 6 * EDSCALE); p_theme->set_constant("h_separation", "ItemList", (p_config.increased_margin + 2) * EDSCALE);
p_theme->set_constant("icon_margin", "ItemList", 6 * EDSCALE); p_theme->set_constant("icon_margin", "ItemList", (p_config.increased_margin + 2) * EDSCALE);
p_theme->set_constant("line_separation", "ItemList", 3 * EDSCALE); p_theme->set_constant("line_separation", "ItemList", p_config.separation_margin);
p_theme->set_constant("outline_size", "ItemList", 0); p_theme->set_constant("outline_size", "ItemList", 0);
} }
} }
@@ -1066,21 +1105,21 @@ void EditorThemeManager::_populate_standard_styles(const Ref<Theme> &p_theme, Th
// Containers. // Containers.
{ {
p_theme->set_constant("separation", "BoxContainer", p_config.base_margin * EDSCALE); p_theme->set_constant("separation", "BoxContainer", p_config.separation_margin);
p_theme->set_constant("separation", "HBoxContainer", p_config.base_margin * EDSCALE); p_theme->set_constant("separation", "HBoxContainer", p_config.separation_margin);
p_theme->set_constant("separation", "VBoxContainer", p_config.base_margin * EDSCALE); p_theme->set_constant("separation", "VBoxContainer", p_config.separation_margin);
p_theme->set_constant("margin_left", "MarginContainer", 0); p_theme->set_constant("margin_left", "MarginContainer", 0);
p_theme->set_constant("margin_top", "MarginContainer", 0); p_theme->set_constant("margin_top", "MarginContainer", 0);
p_theme->set_constant("margin_right", "MarginContainer", 0); p_theme->set_constant("margin_right", "MarginContainer", 0);
p_theme->set_constant("margin_bottom", "MarginContainer", 0); p_theme->set_constant("margin_bottom", "MarginContainer", 0);
p_theme->set_constant("h_separation", "GridContainer", p_config.base_margin * EDSCALE); p_theme->set_constant("h_separation", "GridContainer", p_config.separation_margin);
p_theme->set_constant("v_separation", "GridContainer", p_config.base_margin * EDSCALE); p_theme->set_constant("v_separation", "GridContainer", p_config.separation_margin);
p_theme->set_constant("h_separation", "FlowContainer", p_config.base_margin * EDSCALE); p_theme->set_constant("h_separation", "FlowContainer", p_config.separation_margin);
p_theme->set_constant("v_separation", "FlowContainer", p_config.base_margin * EDSCALE); p_theme->set_constant("v_separation", "FlowContainer", p_config.separation_margin);
p_theme->set_constant("h_separation", "HFlowContainer", p_config.base_margin * EDSCALE); p_theme->set_constant("h_separation", "HFlowContainer", p_config.separation_margin);
p_theme->set_constant("v_separation", "HFlowContainer", p_config.base_margin * EDSCALE); p_theme->set_constant("v_separation", "HFlowContainer", p_config.separation_margin);
p_theme->set_constant("h_separation", "VFlowContainer", p_config.base_margin * EDSCALE); p_theme->set_constant("h_separation", "VFlowContainer", p_config.separation_margin);
p_theme->set_constant("v_separation", "VFlowContainer", p_config.base_margin * EDSCALE); p_theme->set_constant("v_separation", "VFlowContainer", p_config.separation_margin);
// SplitContainer. // SplitContainer.
@@ -1089,13 +1128,13 @@ void EditorThemeManager::_populate_standard_styles(const Ref<Theme> &p_theme, Th
p_theme->set_icon("grabber", "VSplitContainer", p_theme->get_icon(SNAME("GuiVsplitter"), EditorStringName(EditorIcons))); p_theme->set_icon("grabber", "VSplitContainer", p_theme->get_icon(SNAME("GuiVsplitter"), EditorStringName(EditorIcons)));
p_theme->set_icon("grabber", "HSplitContainer", p_theme->get_icon(SNAME("GuiHsplitter"), EditorStringName(EditorIcons))); p_theme->set_icon("grabber", "HSplitContainer", p_theme->get_icon(SNAME("GuiHsplitter"), EditorStringName(EditorIcons)));
p_theme->set_constant("separation", "SplitContainer", p_config.base_margin * 2 * EDSCALE); p_theme->set_constant("separation", "SplitContainer", p_config.separation_margin);
p_theme->set_constant("separation", "HSplitContainer", p_config.base_margin * 2 * EDSCALE); p_theme->set_constant("separation", "HSplitContainer", p_config.separation_margin);
p_theme->set_constant("separation", "VSplitContainer", p_config.base_margin * 2 * EDSCALE); p_theme->set_constant("separation", "VSplitContainer", p_config.separation_margin);
p_theme->set_constant("minimum_grab_thickness", "SplitContainer", 6 * EDSCALE); p_theme->set_constant("minimum_grab_thickness", "SplitContainer", p_config.increased_margin * EDSCALE);
p_theme->set_constant("minimum_grab_thickness", "HSplitContainer", 6 * EDSCALE); p_theme->set_constant("minimum_grab_thickness", "HSplitContainer", p_config.increased_margin * EDSCALE);
p_theme->set_constant("minimum_grab_thickness", "VSplitContainer", 6 * EDSCALE); p_theme->set_constant("minimum_grab_thickness", "VSplitContainer", p_config.increased_margin * EDSCALE);
// GridContainer. // GridContainer.
p_theme->set_constant("v_separation", "GridContainer", Math::round(p_config.widget_margin.y - 2 * EDSCALE)); p_theme->set_constant("v_separation", "GridContainer", Math::round(p_config.widget_margin.y - 2 * EDSCALE));
@@ -1201,8 +1240,8 @@ void EditorThemeManager::_populate_standard_styles(const Ref<Theme> &p_theme, Th
p_theme->set_constant("v_separation", "PopupMenu", p_config.forced_even_separation * EDSCALE); p_theme->set_constant("v_separation", "PopupMenu", p_config.forced_even_separation * EDSCALE);
p_theme->set_constant("outline_size", "PopupMenu", 0); p_theme->set_constant("outline_size", "PopupMenu", 0);
p_theme->set_constant("item_start_padding", "PopupMenu", p_config.base_margin * 1.5 * EDSCALE); p_theme->set_constant("item_start_padding", "PopupMenu", p_config.separation_margin);
p_theme->set_constant("item_end_padding", "PopupMenu", p_config.base_margin * 1.5 * EDSCALE); p_theme->set_constant("item_end_padding", "PopupMenu", p_config.separation_margin);
} }
} }

6
editor/themes/editor_theme_manager.h
View File

@@ -39,6 +39,7 @@ class EditorThemeManager {
// Basic properties. // Basic properties.
String preset; String preset;
String spacing_preset;
bool dark_theme = false; bool dark_theme = false;
Color base_color; Color base_color;
@@ -48,7 +49,8 @@ class EditorThemeManager {
// Extra properties. // Extra properties.
float extra_spacing = 0.0; int base_spacing = 4;
int extra_spacing = 0;
int border_width = 0; int border_width = 0;
int corner_radius = 3; int corner_radius = 3;
@@ -66,7 +68,7 @@ class EditorThemeManager {
int base_margin = 4; int base_margin = 4;
int increased_margin = 4; int increased_margin = 4;
int separation_margin = 4;
int popup_margin = 12; int popup_margin = 12;
int window_border_margin = 8; int window_border_margin = 8;
int top_bar_separation = 8; int top_bar_separation = 8;