godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-26 15:46:23 +00:00
Code Releases Wiki Activity

Scale zoom values in the SpriteFrames editor for hiDPI displays

Browse Source 
This closes #46836.
This commit is contained in:
Hugo Locurcio
2021-03-12 19:05:45 +01:00
parent bf309b8a13
commit e5c5b9570f
1 changed files with 11 additions and 9 deletions
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() { 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(); Size2 texture_size = split_sheet_preview->get_texture()->get_size();
split_sheet_preview->set_custom_minimum_size(texture_size * sheet_zoom); split_sheet_preview->set_custom_minimum_size(texture_size * sheet_zoom);
} }
@@ -732,7 +733,7 @@ void SpriteFramesEditor::_zoom_out() {
} }
void SpriteFramesEditor::_zoom_reset() { 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_column_width(thumbnail_default_size * 3 / 2);
tree->set_fixed_icon_size(Size2(thumbnail_default_size, thumbnail_default_size)); tree->set_fixed_icon_size(Size2(thumbnail_default_size, thumbnail_default_size));
} }
@@ -1229,13 +1230,14 @@ SpriteFramesEditor::SpriteFramesEditor() {
// Config scale. // Config scale.
scale_ratio = 1.2f; scale_ratio = 1.2f;
thumbnail_default_size = 96; thumbnail_default_size = 96 * MAX(1.0, EDSCALE);
thumbnail_zoom = 1.0f; thumbnail_zoom = MAX(1.0, EDSCALE);
max_thumbnail_zoom = 8.0f; max_thumbnail_zoom = 8.0f * MAX(1.0, EDSCALE);
min_thumbnail_zoom = 0.1f; min_thumbnail_zoom = 0.1f * MAX(1.0, EDSCALE);
sheet_zoom = 1.0f; // Default the zoom to match the editor scale, but don't dezoom on editor scales below 100% to prevent pixel art from looking bad.
max_sheet_zoom = 16.0f; sheet_zoom = MAX(1.0, EDSCALE);
min_sheet_zoom = 0.01f; max_sheet_zoom = 16.0f * MAX(1.0, EDSCALE);
min_sheet_zoom = 0.01f * MAX(1.0, EDSCALE);
_zoom_reset(); _zoom_reset();
} }