diff options
| -rw-r--r-- | editor/connections_dialog.cpp | 1 | ||||
| -rw-r--r-- | editor/editor_themes.cpp | 9 | ||||
| -rw-r--r-- | scene/gui/link_button.cpp | 1 |
3 files changed, 10 insertions, 1 deletions
diff --git a/editor/connections_dialog.cpp b/editor/connections_dialog.cpp index 320e5d8510..a04065a463 100644 --- a/editor/connections_dialog.cpp +++ b/editor/connections_dialog.cpp @@ -410,6 +410,7 @@ ConnectDialog::ConnectDialog() { tree = memnew(SceneTreeEditor(false)); tree->set_connecting_signal(true); + tree->set_show_enabled_subscene(true); tree->get_scene_tree()->connect("item_activated", callable_mp(this, &ConnectDialog::_item_activated)); tree->connect("node_selected", callable_mp(this, &ConnectDialog::_tree_node_selected)); tree->set_connect_to_script_mode(true); diff --git a/editor/editor_themes.cpp b/editor/editor_themes.cpp index 88976ed332..c589a3c042 100644 --- a/editor/editor_themes.cpp +++ b/editor/editor_themes.cpp @@ -676,7 +676,14 @@ Ref<Theme> create_editor_theme(const Ref<Theme> p_theme) { theme->set_stylebox("panel", "PopupDialog", style_popup); // PopupMenu - theme->set_stylebox("panel", "PopupMenu", style_popup); + const int popup_menu_margin_size = default_margin_size * 1.5 * EDSCALE; + Ref<StyleBoxFlat> style_popup_menu = style_popup->duplicate(); + style_popup_menu->set_default_margin(MARGIN_LEFT, popup_menu_margin_size); + style_popup_menu->set_default_margin(MARGIN_TOP, popup_menu_margin_size); + style_popup_menu->set_default_margin(MARGIN_RIGHT, popup_menu_margin_size); + style_popup_menu->set_default_margin(MARGIN_BOTTOM, popup_menu_margin_size); + + theme->set_stylebox("panel", "PopupMenu", style_popup_menu); theme->set_stylebox("separator", "PopupMenu", style_popup_separator); theme->set_stylebox("labeled_separator_left", "PopupMenu", style_popup_labeled_separator_left); theme->set_stylebox("labeled_separator_right", "PopupMenu", style_popup_labeled_separator_right); diff --git a/scene/gui/link_button.cpp b/scene/gui/link_button.cpp index d85c8d2112..b66ee514dc 100644 --- a/scene/gui/link_button.cpp +++ b/scene/gui/link_button.cpp @@ -295,5 +295,6 @@ void LinkButton::_bind_methods() { LinkButton::LinkButton() { text_buf.instance(); underline_mode = UNDERLINE_MODE_ALWAYS; + set_focus_mode(FOCUS_NONE); set_default_cursor_shape(CURSOR_POINTING_HAND); } |