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

Merge pull request #113464 from kleonc/sprite_dialogs_allow_maximizing

Browse source 
Allow maximizing sprite related dialogs
This commit is contained in:
Rémi Verschelde 2025-12-03 09:50:00 +01:00
commit acb157df7a
No known key found for this signature in database
GPG key ID: C3336907360768E1
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
editor/scene/sprite_frames_editor_plugin.cpp
View file

@ -2410,6 +2410,7 @@ SpriteFramesEditor::SpriteFramesEditor() {
delete_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SpriteFramesEditor::_animation_remove_confirmed)); delete_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SpriteFramesEditor::_animation_remove_confirmed));
split_sheet_dialog = memnew(ConfirmationDialog); split_sheet_dialog = memnew(ConfirmationDialog);
split_sheet_dialog->set_flag(Window::FLAG_MAXIMIZE_DISABLED, false);
add_child(split_sheet_dialog); add_child(split_sheet_dialog);
split_sheet_dialog->set_title(TTRC("Select Frames")); split_sheet_dialog->set_title(TTRC("Select Frames"));
split_sheet_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SpriteFramesEditor::_sheet_add_frames)); split_sheet_dialog->connect(SceneStringName(confirmed), callable_mp(this, &SpriteFramesEditor::_sheet_add_frames));
@ -2654,7 +2655,9 @@ SpriteFramesEditor::SpriteFramesEditor() {
file_split_sheet->set_title(TTRC("Create Frames from Sprite Sheet")); file_split_sheet->set_title(TTRC("Create Frames from Sprite Sheet"));
file_split_sheet->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE); file_split_sheet->set_file_mode(EditorFileDialog::FILE_MODE_OPEN_FILE);
add_child(file_split_sheet); add_child(file_split_sheet);
file_split_sheet->connect("file_selected", callable_mp(this, &SpriteFramesEditor::_prepare_sprite_sheet)); // Deferred so file dialog is hidden when sprite sheet dialog popups. Otherwise, after allowing
// sprite sheet dialog to be maximized, it would complain about already having exclusive child window.
file_split_sheet->connect("file_selected", callable_mp(this, &SpriteFramesEditor::_prepare_sprite_sheet), CONNECT_DEFERRED);
// Config scale. // Config scale.
scale_ratio = 1.2f; scale_ratio = 1.2f;

1
editor/scene/texture/texture_region_editor_plugin.cpp
View file

@ -1160,6 +1160,7 @@ void TextureRegionEditor::_bind_methods() {
TextureRegionEditor::TextureRegionEditor() { TextureRegionEditor::TextureRegionEditor() {
set_title(TTR("Region Editor")); set_title(TTR("Region Editor"));
set_flag(FLAG_MAXIMIZE_DISABLED, false);
set_process_shortcut_input(true); set_process_shortcut_input(true);
set_ok_button_text(TTR("Close")); set_ok_button_text(TTR("Close"));
// Handled manually, to allow canceling dragging. // Handled manually, to allow canceling dragging.