Skip to content

Increase default zoom for small sprite sheets in SpriteFramesEditor #111471

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −4
Open

Increase default zoom for small sprite sheets in SpriteFramesEditor #111471

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
14 changes: 10 additions & 4 deletions editor/scene/sprite_frames_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,15 @@ void SpriteFramesEditor::_sheet_zoom_out() {
}

void SpriteFramesEditor::_sheet_zoom_reset() {
// Default the zoom to match the editor scale, but don't dezoom on editor scales below 100% to prevent pixel art from looking bad.
sheet_zoom = MAX(1.0f, EDSCALE);
Size2 texture_size = split_sheet_preview->get_texture()->get_size();
const Size2 display_area_size = 0.9 * split_sheet_scroll->get_size();
const Size2 texture_size = split_sheet_preview->get_texture()->get_size();
const Size2 texture_ratio = display_area_size / texture_size;
const float min_texture_ratio = MIN(texture_ratio.x, texture_ratio.y);
const float default_zoom = MAX(Math::floor(min_texture_ratio), 1.0f);
// Default the zoom to match the editor scale
// while zooming in as much as possible without overflowing the display area
// and don't dezoom below 100% to prevent pixels merging.
sheet_zoom = MAX(default_zoom, EDSCALE);
split_sheet_preview->set_custom_minimum_size(texture_size * sheet_zoom);
}

Expand Down Expand Up @@ -626,7 +632,7 @@ void SpriteFramesEditor::_prepare_sprite_sheet(const String &p_file) {
previous_texture_size = size;

// Reset zoom.
_sheet_zoom_reset();
split_sheet_dialog->connect(SceneStringName(focus_entered), callable_mp(this, &SpriteFramesEditor::_sheet_zoom_reset), CONNECT_ONE_SHOT);
}

split_sheet_dialog->popup_centered_ratio(0.65);
Expand Down