summaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorYuri Sizov <yuris@humnom.net>2023-09-15 19:48:14 +0200
committerYuri Sizov <yuris@humnom.net>2023-09-15 19:48:14 +0200
commitdf6cd37a697fcc2f63940d7984726661069c18b6 (patch)
tree269bc50f887b251408ad40cf726571e931f53b82 /modules
parent508a758eabf7c7f27270e303eb29e72d56701503 (diff)
parent8ecc0c4f47f78874d94ad701cea4ea0173bddbb2 (diff)
downloadredot-engine-df6cd37a697fcc2f63940d7984726661069c18b6.tar.gz
Merge pull request #81516 from YuriSizov/editor-theme-access-the-success
Fix accessing editor theme items throughout the UI
Diffstat (limited to 'modules')
-rw-r--r--modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs2
-rw-r--r--modules/multiplayer/editor/replication_editor.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs b/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
index f01fbbd1b9..1c1185d91b 100644
--- a/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
+++ b/modules/mono/editor/GodotTools/GodotTools/GodotSharpEditor.cs
@@ -499,7 +499,7 @@ namespace GodotTools
_toolBarBuildButton = new Button
{
Flat = true,
- Icon = editorBaseControl.GetThemeIcon("BuildCSharp", "EditorIcons"),
+ Icon = EditorInterface.Singleton.GetEditorTheme().GetIcon("BuildCSharp", "EditorIcons"),
FocusMode = Control.FocusModeEnum.None,
Shortcut = EditorDefShortcut("mono/build_solution", "Build Project".TTR(), (Key)KeyModifierMask.MaskAlt | Key.B),
ShortcutInTooltip = true,
diff --git a/modules/multiplayer/editor/replication_editor.cpp b/modules/multiplayer/editor/replication_editor.cpp
index 0051d82e99..1c7546436b 100644
--- a/modules/multiplayer/editor/replication_editor.cpp
+++ b/modules/multiplayer/editor/replication_editor.cpp
@@ -359,7 +359,7 @@ void ReplicationEditor::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_ENTER_TREE:
case EditorSettings::NOTIFICATION_EDITOR_SETTINGS_CHANGED: {
- add_theme_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_theme_stylebox(SNAME("panel"), SNAME("Panel")));
+ add_theme_style_override("panel", EditorNode::get_singleton()->get_editor_theme()->get_stylebox(SNAME("panel"), SNAME("Panel")));
add_pick_button->set_icon(get_theme_icon(SNAME("Add"), EditorStringName(EditorIcons)));
pin->set_icon(get_theme_icon(SNAME("Pin"), EditorStringName(EditorIcons)));
} break;