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

Fix canvas zoom controls lazy position update 

After hiding/showing rulers, zoom controls were kept at the wrong position until an update happened because of other reason.

(cherry picked from commit 4dd9efe757)
This commit is contained in:
Pedro J. Estébanez 2019-05-20 22:35:31 +02:00 committed by Rémi Verschelde
parent 2514594a45
commit f040f7c283
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -3903,6 +3903,7 @@ void CanvasItemEditor::_popup_callback(int p_op) {
show_rulers = !show_rulers; show_rulers = !show_rulers;
int idx = view_menu->get_popup()->get_item_index(SHOW_RULERS); int idx = view_menu->get_popup()->get_item_index(SHOW_RULERS);
view_menu->get_popup()->set_item_checked(idx, show_rulers); view_menu->get_popup()->set_item_checked(idx, show_rulers);
_update_scrollbars();
viewport->update(); viewport->update();
} break; } break;
case SHOW_GUIDES: { case SHOW_GUIDES: {
@ -4381,6 +4382,7 @@ Dictionary CanvasItemEditor::get_state() const {
void CanvasItemEditor::set_state(const Dictionary &p_state) { void CanvasItemEditor::set_state(const Dictionary &p_state) {
bool update_scrollbars = false;
Dictionary state = p_state; Dictionary state = p_state;
if (state.has("zoom")) { if (state.has("zoom")) {
zoom = p_state["zoom"]; zoom = p_state["zoom"];
@ -4389,7 +4391,7 @@ void CanvasItemEditor::set_state(const Dictionary &p_state) {
if (state.has("ofs")) { if (state.has("ofs")) {
view_offset = p_state["ofs"]; view_offset = p_state["ofs"];
previous_update_view_offset = view_offset; previous_update_view_offset = view_offset;
_update_scrollbars(); update_scrollbars = true;
} }
if (state.has("grid_offset")) { if (state.has("grid_offset")) {
@ -4477,6 +4479,7 @@ void CanvasItemEditor::set_state(const Dictionary &p_state) {
show_rulers = state["show_rulers"]; show_rulers = state["show_rulers"];
int idx = view_menu->get_popup()->get_item_index(SHOW_RULERS); int idx = view_menu->get_popup()->get_item_index(SHOW_RULERS);
view_menu->get_popup()->set_item_checked(idx, show_rulers); view_menu->get_popup()->set_item_checked(idx, show_rulers);
update_scrollbars = true;
} }
if (state.has("show_guides")) { if (state.has("show_guides")) {
@ -4521,6 +4524,9 @@ void CanvasItemEditor::set_state(const Dictionary &p_state) {
skeleton_menu->get_popup()->set_item_checked(idx, skeleton_show_bones); skeleton_menu->get_popup()->set_item_checked(idx, skeleton_show_bones);
} }
if (update_scrollbars) {
_update_scrollbars();
}
viewport->update(); viewport->update();
} }