Stowage/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-12-07 22:00:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #111913 from bruvzg/ed_spin

Browse source 
Use `EditorSpinSlider` in the theme editor.
This commit is contained in:
Thaddeus Crews 2025-12-02 11:51:59 -06:00
commit 8749308796
No known key found for this signature in database
GPG key ID: 8C6E5FEB5FC03CCC
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
editor/scene/gui/theme_editor_plugin.cpp
View file

@ -39,6 +39,7 @@
#include "editor/file_system/editor_file_system.h"
#include "editor/gui/editor_bottom_panel.h"
#include "editor/gui/editor_file_dialog.h"
#include "editor/gui/editor_spin_slider.h"
#include "editor/gui/progress_dialog.h"
#include "editor/inspector/editor_resource_picker.h"
#include "editor/settings/editor_command_palette.h"
@ -50,7 +51,6 @@
#include "scene/gui/panel_container.h"
#include "scene/gui/scroll_container.h"
#include "scene/gui/separator.h"
#include "scene/gui/spin_box.h"
#include "scene/gui/split_container.h"
#include "scene/gui/tab_bar.h"
#include "scene/gui/tab_container.h"
@ -2630,10 +2630,11 @@ void ThemeTypeEditor::_update_type_items() {
HashMap<StringName, bool> constant_items = _get_type_items(edited_type, Theme::DATA_TYPE_CONSTANT, show_default);
for (const KeyValue<StringName, bool> &E : constant_items) {
HBoxContainer *item_control = _create_property_control(Theme::DATA_TYPE_CONSTANT, E.key, E.value);
SpinBox *item_editor = memnew(SpinBox);
EditorSpinSlider *item_editor = memnew(EditorSpinSlider);
item_editor->set_h_size_flags(SIZE_EXPAND_FILL);
item_editor->set_min(-100000);
item_editor->set_max(100000);
item_editor->set_editing_integer(true);
item_editor->set_step(1);
item_editor->set_allow_lesser(true);
item_editor->set_allow_greater(true);
@ -2644,7 +2645,7 @@ void ThemeTypeEditor::_update_type_items() {
item_editor->connect(SceneStringName(value_changed), callable_mp(this, &ThemeTypeEditor::_constant_item_changed).bind(E.key));
} else {
item_editor->set_value(ThemeDB::get_singleton()->get_default_theme()->get_constant(E.key, edited_type));
item_editor->set_editable(false);
item_editor->set_read_only(true);
}
_add_focusable(item_editor);
@ -2702,10 +2703,11 @@ void ThemeTypeEditor::_update_type_items() {
HashMap<StringName, bool> font_size_items = _get_type_items(edited_type, Theme::DATA_TYPE_FONT_SIZE, show_default);
for (const KeyValue<StringName, bool> &E : font_size_items) {
HBoxContainer *item_control = _create_property_control(Theme::DATA_TYPE_FONT_SIZE, E.key, E.value);
SpinBox *item_editor = memnew(SpinBox);
EditorSpinSlider *item_editor = memnew(EditorSpinSlider);
item_editor->set_h_size_flags(SIZE_EXPAND_FILL);
item_editor->set_min(-100000);
item_editor->set_max(100000);
item_editor->set_editing_integer(true);
item_editor->set_step(1);
item_editor->set_allow_lesser(true);
item_editor->set_allow_greater(true);
@ -2716,7 +2718,7 @@ void ThemeTypeEditor::_update_type_items() {
item_editor->connect(SceneStringName(value_changed), callable_mp(this, &ThemeTypeEditor::_font_size_item_changed).bind(E.key));
} else {
item_editor->set_value(ThemeDB::get_singleton()->get_default_theme()->get_font_size(E.key, edited_type));
item_editor->set_editable(false);
item_editor->set_read_only(true);
}
_add_focusable(item_editor);