nick/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-02-08 03:38:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Project Manager ProjectDialog install dialog OK button

Browse Source
This commit is contained in:
Adam Scott
2026-01-07 17:07:51 -05:00
parent 5d9722e832
commit b486f2d07a
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
editor/project_manager/project_dialog.cpp
View File

@@ -51,12 +51,12 @@
void ProjectDialog::_set_message(const String &p_msg, MessageType p_type, InputType p_input_type) {
msg->set_text(p_msg);
if (p_type == MESSAGE_ERROR) {
invalid_flags.set_flag(ValidationFlags::INVALID_PATH_INPUT);
invalid_state_flags.set_flag(InvalidStateFlag::INVALID_STATE_FLAG_PATH_INPUT);
} else {
invalid_flags.clear_flag(ValidationFlags::INVALID_PATH_INPUT);
invalid_state_flags.clear_flag(InvalidStateFlag::INVALID_STATE_FLAG_PATH_INPUT);
}
get_ok_button()->set_disabled(!invalid_flags.is_empty());
Ref<Texture2D> new_icon;
switch (p_type) {
@@ -79,6 +79,12 @@ void ProjectDialog::_set_message(const String &p_msg, MessageType p_type, InputT
} else if (p_input_type == INSTALL_PATH) {
install_status_rect->set_texture(new_icon);
}
_update_ok_button();
}
void ProjectDialog::_update_ok_button() {
get_ok_button()->set_disabled(!invalid_state_flags.is_empty());
}
static bool is_zip_file(Ref<DirAccess> p_d, const String &p_path) {
@@ -518,11 +524,12 @@ void ProjectDialog::_renderer_selected() {
if (rd_error) {
// Needs to be set here since theme colors aren't available at startup.
rd_not_supported->add_theme_color_override(SceneStringName(font_color), get_theme_color(SNAME("error_color"), EditorStringName(Editor)));
invalid_flags.set_flag(ValidationFlags::INVALID_RENDERER_SELECT);
invalid_state_flags.set_flag(InvalidStateFlag::INVALID_STATE_FLAG_RENDERER_SELECT);
} else {
invalid_flags.clear_flag(ValidationFlags::INVALID_RENDERER_SELECT);
invalid_state_flags.clear_flag(InvalidStateFlag::INVALID_STATE_FLAG_RENDERER_SELECT);
}
get_ok_button()->set_disabled(!invalid_flags.is_empty());
_update_ok_button();
}
void ProjectDialog::_nonempty_confirmation_ok_pressed() {
@@ -840,6 +847,8 @@ void ProjectDialog::ask_for_path_and_show() {
}
void ProjectDialog::show_dialog(bool p_reset_name, bool p_is_confirmed) {
_update_ok_button();
if (mode == MODE_IMPORT && !p_is_confirmed) {
return;
}

10
editor/project_manager/project_dialog.h
View File

@@ -64,9 +64,10 @@ private:
INSTALL_PATH,
};
enum ValidationFlags {
INVALID_PATH_INPUT = 1,
INVALID_RENDERER_SELECT = 2
enum InvalidStateFlag {
INVALID_STATE_FLAG_NONE = 0,
INVALID_STATE_FLAG_PATH_INPUT = 1 << 0,
INVALID_STATE_FLAG_RENDERER_SELECT = 1 << 1,
};
Mode mode = MODE_NEW;
@@ -109,9 +110,10 @@ private:
String original_project_path;
bool duplicate_can_edit = false;
BitField<ValidationFlags> invalid_flags;
BitField<InvalidStateFlag> invalid_state_flags = INVALID_STATE_FLAG_NONE;
void _set_message(const String &p_msg, MessageType p_type, InputType input_type = PROJECT_PATH);
void _update_ok_button();
void _validate_path();
// Project path for MODE_NEW and MODE_INSTALL. Install path for MODE_IMPORT.