godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-10 13:00:37 +00:00
Code Releases Wiki Activity

Merge pull request #88413 from LeulMulugeta/dont_reset_select_frames

Browse Source 
Remember frames when selecting `SpriteFrame` frames
This commit is contained in:
Rémi Verschelde
2024-03-05 23:44:33 +01:00
parent c84d3385f7 effad7be0c
commit 0975e2941c
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
editor/plugins/sprite_frames_editor_plugin.cpp
View File

@@ -526,6 +526,7 @@ void SpriteFramesEditor::_prepare_sprite_sheet(const String &p_file) {
split_sheet_offset_x->set_max(size.x); split_sheet_offset_x->set_max(size.x);
split_sheet_offset_y->set_max(size.y); split_sheet_offset_y->set_max(size.y);
if (size != previous_texture_size) {
// Different texture, reset to 4x4. // Different texture, reset to 4x4.
dominant_param = PARAM_FRAME_COUNT; dominant_param = PARAM_FRAME_COUNT;
updating_split_settings = true; updating_split_settings = true;
@@ -538,6 +539,8 @@ void SpriteFramesEditor::_prepare_sprite_sheet(const String &p_file) {
split_sheet_offset_x->set_value(0); split_sheet_offset_x->set_value(0);
split_sheet_offset_y->set_value(0); split_sheet_offset_y->set_value(0);
updating_split_settings = false; updating_split_settings = false;
}
previous_texture_size = size;
// Reset zoom. // Reset zoom.
_sheet_zoom_reset(); _sheet_zoom_reset();

2
editor/plugins/sprite_frames_editor_plugin.h
View File

@@ -167,6 +167,8 @@ class SpriteFramesEditor : public HSplitContainer {
bool frames_need_sort = false; bool frames_need_sort = false;
int last_frame_selected = 0; int last_frame_selected = 0;
Size2i previous_texture_size;
float scale_ratio; float scale_ratio;
int thumbnail_default_size; int thumbnail_default_size;
float thumbnail_zoom; float thumbnail_zoom;