godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #46946 from Calinou/editor-sprite-frames-zoom-hidpi 

Scale zoom values in the SpriteFrames editor for hiDPI displays
This commit is contained in:
Rémi Verschelde 2021-03-13 21:49:43 +01:00 committed by GitHub
parent 99a707406b e5c5b9570f
commit 0444f5ac47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
editor/plugins/sprite_frames_editor_plugin.cpp
View File

@ -219,7 +219,8 @@ void SpriteFramesEditor::_sheet_zoom_out() {
}
void SpriteFramesEditor::_sheet_zoom_reset() {
sheet_zoom = 1.f;
// 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.0, EDSCALE);
Size2 texture_size = split_sheet_preview->get_texture()->get_size();
split_sheet_preview->set_custom_minimum_size(texture_size * sheet_zoom);
}
@ -732,7 +733,7 @@ void SpriteFramesEditor::_zoom_out() {
}
void SpriteFramesEditor::_zoom_reset() {
thumbnail_zoom = 1.0f;
thumbnail_zoom = MAX(1.0, EDSCALE);
tree->set_fixed_column_width(thumbnail_default_size * 3 / 2);
tree->set_fixed_icon_size(Size2(thumbnail_default_size, thumbnail_default_size));
}
@ -1229,13 +1230,14 @@ SpriteFramesEditor::SpriteFramesEditor() {
// Config scale.
scale_ratio = 1.2f;
thumbnail_default_size = 96;
thumbnail_zoom = 1.0f;
max_thumbnail_zoom = 8.0f;
min_thumbnail_zoom = 0.1f;
sheet_zoom = 1.0f;
max_sheet_zoom = 16.0f;
min_sheet_zoom = 0.01f;
thumbnail_default_size = 96 * MAX(1.0, EDSCALE);
thumbnail_zoom = MAX(1.0, EDSCALE);
max_thumbnail_zoom = 8.0f * MAX(1.0, EDSCALE);
min_thumbnail_zoom = 0.1f * MAX(1.0, EDSCALE);
// 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.0, EDSCALE);
max_sheet_zoom = 16.0f * MAX(1.0, EDSCALE);
min_sheet_zoom = 0.01f * MAX(1.0, EDSCALE);
_zoom_reset();
}