asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #96164 from Giganzo/signal-dialog-align-fix

Browse source 
Fix Connect Signal Dialog control alignment
This commit is contained in:
Rémi Verschelde 2024-09-08 23:21:36 +02:00
commit 466b4b9ff8
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 0 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
editor/connections_dialog.cpp
View file

@ -486,11 +486,6 @@ void ConnectDialog::_notification(int p_what) {
type_list->set_item_icon(i, get_editor_theme_icon(type_name)); type_list->set_item_icon(i, get_editor_theme_icon(type_name));
} }
Ref<StyleBox> style = get_theme_stylebox(CoreStringName(normal), "LineEdit")->duplicate();
if (style.is_valid()) {
style->set_content_margin(SIDE_TOP, style->get_content_margin(SIDE_TOP) + 1.0);
from_signal->add_theme_style_override(CoreStringName(normal), style);
}
method_search->set_right_icon(get_editor_theme_icon("Search")); method_search->set_right_icon(get_editor_theme_icon("Search"));
open_method_tree->set_icon(get_editor_theme_icon("Edit")); open_method_tree->set_icon(get_editor_theme_icon("Edit"));
} break; } break;

4
editor/themes/editor_theme_manager.cpp
View file

@ -865,7 +865,6 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
// CheckBox. // CheckBox.
{ {
Ref<StyleBoxFlat> checkbox_style = p_config.panel_container_style->duplicate(); Ref<StyleBoxFlat> checkbox_style = p_config.panel_container_style->duplicate();
checkbox_style->set_content_margin_individual((p_config.increased_margin + 2) * EDSCALE, p_config.base_margin * EDSCALE, (p_config.increased_margin + 2) * EDSCALE, p_config.base_margin * EDSCALE);
p_theme->set_stylebox(CoreStringName(normal), "CheckBox", checkbox_style); p_theme->set_stylebox(CoreStringName(normal), "CheckBox", checkbox_style);
p_theme->set_stylebox(SceneStringName(pressed), "CheckBox", checkbox_style); p_theme->set_stylebox(SceneStringName(pressed), "CheckBox", checkbox_style);
@ -1165,9 +1164,6 @@ void EditorThemeManager::_populate_standard_styles(const Ref<EditorTheme> &p_the
// LineEdit & TextEdit. // LineEdit & TextEdit.
{ {
Ref<StyleBoxFlat> text_editor_style = p_config.button_style->duplicate(); Ref<StyleBoxFlat> text_editor_style = p_config.button_style->duplicate();
// The original button_style style has an extra 1 pixel offset that makes LineEdits not align with Buttons,
// so this compensates for that.
text_editor_style->set_content_margin(SIDE_TOP, text_editor_style->get_content_margin(SIDE_TOP) - 1 * EDSCALE);
// Don't round the bottom corners to make the line look sharper. // Don't round the bottom corners to make the line look sharper.
text_editor_style->set_corner_radius(CORNER_BOTTOM_LEFT, 0); text_editor_style->set_corner_radius(CORNER_BOTTOM_LEFT, 0);