From 0e98c9d705d2c3ff41e46d6f3f2e5022ff55a553 Mon Sep 17 00:00:00 2001 From: "Randolph W. Aarseth II" Date: Mon, 7 Oct 2024 17:35:06 -0700 Subject: [PATCH] Rebranding Code No. 12 --- editor/editor_settings.cpp | 10 ++++++---- editor/themes/editor_theme_manager.cpp | 6 ++++++ 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/editor/editor_settings.cpp b/editor/editor_settings.cpp index ceaffb64c498..523f837486d7 100644 --- a/editor/editor_settings.cpp +++ b/editor/editor_settings.cpp @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -531,7 +533,7 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { // Theme EDITOR_SETTING_BASIC(Variant::BOOL, PROPERTY_HINT_ENUM, "interface/theme/follow_system_theme", false, "") - EDITOR_SETTING_BASIC(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_BASIC(Variant::STRING, PROPERTY_HINT_ENUM, "interface/theme/preset", "Default", "Default,Breeze Dark,Godot,Godot 2,Gray,Light,Solarized (Dark),Solarized (Light),Black (OLED),Custom") EDITOR_SETTING_BASIC(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_BASIC(Variant::COLOR, PROPERTY_HINT_NONE, "interface/theme/base_color", Color(0.2, 0.23, 0.31), "") @@ -637,7 +639,7 @@ void EditorSettings::_load_defaults(Ref p_extra_config) { // Theme _initial_set("text_editor/theme/line_spacing", 6); - EDITOR_SETTING_BASIC(Variant::STRING, PROPERTY_HINT_ENUM, "text_editor/theme/color_theme", "Default", "Default,Godot 2,Custom") + EDITOR_SETTING_BASIC(Variant::STRING, PROPERTY_HINT_ENUM, "text_editor/theme/color_theme", "Default", "Default,Godot,Godot 2,Custom") // Theme: Highlighting _load_godot2_text_editor_theme(); @@ -1113,7 +1115,7 @@ bool EditorSettings::_save_text_editor_theme(const String &p_file) { } bool EditorSettings::_is_default_text_editor_theme(const String &p_theme_name) { - return p_theme_name == "default" || p_theme_name == "godot 2" || p_theme_name == "custom"; + return p_theme_name == "default" || p_theme_name == "godot" || p_theme_name == "godot 2" || p_theme_name == "custom"; } const String EditorSettings::_get_project_metadata_path() const { @@ -1551,7 +1553,7 @@ void EditorSettings::load_favorites_and_recent_dirs() { } void EditorSettings::list_text_editor_themes() { - String themes = "Default,Godot 2,Custom"; + String themes = "Default,Godot,Godot 2,Custom"; Ref d = DirAccess::open(EditorPaths::get_singleton()->get_text_editor_themes_dir()); if (d.is_valid()) { diff --git a/editor/themes/editor_theme_manager.cpp b/editor/themes/editor_theme_manager.cpp index 129cbfa53954..df01fd0d00c8 100644 --- a/editor/themes/editor_theme_manager.cpp +++ b/editor/themes/editor_theme_manager.cpp @@ -5,6 +5,8 @@ /* GODOT ENGINE */ /* https://godotengine.org */ /**************************************************************************/ +/* Copyright (c) 2024-present Redot Engine contributors */ +/* (see REDOT_AUTHORS.md) */ /* Copyright (c) 2014-present Godot Engine contributors (see AUTHORS.md). */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* */ @@ -288,6 +290,10 @@ EditorThemeManager::ThemeConfiguration EditorThemeManager::_create_theme_config( preset_accent_color = Color(0.26, 0.76, 1.00); preset_base_color = Color(0.24, 0.26, 0.28); preset_contrast = config.default_contrast; + } else if (config.preset == "Godot") { + preset_accent_color = Color(0.44, 0.73, 0.98); + preset_base_color = Color(0.21, 0.24, 0.29); + preset_contrast = config.default_contrast; } else if (config.preset == "Godot 2") { preset_accent_color = Color(0.53, 0.67, 0.89); preset_base_color = Color(0.24, 0.23, 0.27);