asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #35297 from Calinou/2d-zoom-reset-clamp-editor-scale

Browse source 
Clamp the editor scale to 1 when resetting zoom in the 2D editor
This commit is contained in:
Rémi Verschelde 2020-01-19 09:30:12 +01:00 committed by GitHub
commit b2e2ce1643
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -4236,7 +4236,7 @@ void CanvasItemEditor::_button_zoom_minus() {
}
void CanvasItemEditor::_button_zoom_reset() {
_zoom_on_position(1.0 * EDSCALE, viewport_scrollable->get_size() / 2.0);
_zoom_on_position(1.0 * MAX(1, EDSCALE), viewport_scrollable->get_size() / 2.0);
}
void CanvasItemEditor::_button_zoom_plus() {
@ -5038,7 +5038,7 @@ void CanvasItemEditor::set_state(const Dictionary &p_state) {
if (state.has("zoom")) {
// Compensate the editor scale, so that the editor scale can be changed
// and the zoom level will still be the same (relative to the editor scale).
zoom = float(p_state["zoom"]) * EDSCALE;
zoom = float(p_state["zoom"]) * MAX(1, EDSCALE);
_update_zoom_label();
}