Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Increase the page size for array/dictionary editors to 20 #44864

Merged
merged 1 commit into from
Feb 19, 2021
+10 −8
Merged

Increase the page size for array/dictionary editors to 20 #44864

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions editor/editor_properties_array_dict.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,7 @@ void EditorPropertyArray::_bind_methods() {

EditorPropertyArray::EditorPropertyArray() {
object.instance();
page_idx = 0;
page_len = 10;
page_len = int(EDITOR_GET("interface/inspector/max_array_dictionary_items_per_page"));
edit = memnew(Button);
edit->set_flat(true);
edit->set_h_size_flags(SIZE_EXPAND_FILL);
Expand Down Expand Up @@ -1069,8 +1068,7 @@ void EditorPropertyDictionary::_bind_methods() {

EditorPropertyDictionary::EditorPropertyDictionary() {
object.instance();
page_idx = 0;
page_len = 10;
page_len = int(EDITOR_GET("interface/inspector/max_array_dictionary_items_per_page"));
edit = memnew(Button);
edit->set_flat(true);
edit->set_h_size_flags(SIZE_EXPAND_FILL);
Expand Down
8 changes: 4 additions & 4 deletions editor/editor_properties_array_dict.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ class EditorPropertyArray : public EditorProperty {
bool dropping;

Ref<EditorPropertyArrayObject> object;
int page_len;
int page_idx;
int page_len = 20;
int page_idx = 0;
int changing_type_idx;
Button *edit;
VBoxContainer *vbox;
Expand Down Expand Up @@ -129,8 +129,8 @@ class EditorPropertyDictionary : public EditorProperty {
bool updating;

Ref<EditorPropertyDictionaryObject> object;
int page_len;
int page_idx;
int page_len = 20;
int page_idx = 0;
int changing_type_idx;
Button *edit;
VBoxContainer *vbox;
Expand Down
4 changes: 4 additions & 0 deletions editor/editor_settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,10 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
_initial_set("interface/editor/hide_console_window", false);
_initial_set("interface/editor/save_each_scene_on_quit", true); // Regression

// Inspector
_initial_set("interface/inspector/max_array_dictionary_items_per_page", 20);
hints["interface/inspector/max_array_dictionary_items_per_page"] = PropertyInfo(Variant::INT, "interface/inspector/max_array_dictionary_items_per_page", PROPERTY_HINT_RANGE, "10,100,1", PROPERTY_USAGE_DEFAULT);

// Theme
_initial_set("interface/theme/preset", "Default");
hints["interface/theme/preset"] = PropertyInfo(Variant::STRING, "interface/theme/preset", PROPERTY_HINT_ENUM, "Default,Alien,Arc,Godot 2,Grey,Light,Solarized (Dark),Solarized (Light),Custom", PROPERTY_USAGE_DEFAULT);
Expand Down