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

Allow to remove 2D editor limits

This commit is contained in:
Tomasz Chabora 2019-06-24 21:15:26 +02:00
parent ab932bb675
commit c81525ec05
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/editor_settings.cpp
View File

@ -573,6 +573,7 @@ void EditorSettings::_load_defaults(Ref<ConfigFile> p_extra_config) {
_initial_set("editors/2d/bone_outline_color", Color(0.35, 0.35, 0.35)); _initial_set("editors/2d/bone_outline_color", Color(0.35, 0.35, 0.35));
_initial_set("editors/2d/bone_outline_size", 2); _initial_set("editors/2d/bone_outline_size", 2);
_initial_set("editors/2d/viewport_border_color", Color(0.4, 0.4, 1.0, 0.4)); _initial_set("editors/2d/viewport_border_color", Color(0.4, 0.4, 1.0, 0.4));
_initial_set("editors/2d/constrain_editor_view", true);
_initial_set("editors/2d/warped_mouse_panning", true); _initial_set("editors/2d/warped_mouse_panning", true);
_initial_set("editors/2d/simple_panning", false); _initial_set("editors/2d/simple_panning", false);
_initial_set("editors/2d/scroll_to_pan", false); _initial_set("editors/2d/scroll_to_pan", false);

13
editor/plugins/canvas_item_editor_plugin.cpp
View File

@ -3615,18 +3615,19 @@ void CanvasItemEditor::_update_scrollbars() {
// Constraints the view offset and updates the scrollbars // Constraints the view offset and updates the scrollbars
Point2 begin = canvas_item_rect.position; Point2 begin = canvas_item_rect.position;
Point2 end = canvas_item_rect.position + canvas_item_rect.size - local_rect.size / zoom; Point2 end = canvas_item_rect.position + canvas_item_rect.size - local_rect.size / zoom;
bool constrain_editor_view = bool(EditorSettings::get_singleton()->get("editors/2d/constrain_editor_view"));
if (canvas_item_rect.size.height <= (local_rect.size.y / zoom)) { if (canvas_item_rect.size.height <= (local_rect.size.y / zoom)) {
if (ABS(begin.y - previous_update_view_offset.y) < ABS(begin.y - view_offset.y)) { if (constrain_editor_view && ABS(begin.y - previous_update_view_offset.y) < ABS(begin.y - view_offset.y)) {
view_offset.y = previous_update_view_offset.y; view_offset.y = previous_update_view_offset.y;
} }
v_scroll->hide(); v_scroll->hide();
} else { } else {
if (view_offset.y > end.y && view_offset.y > previous_update_view_offset.y) { if (constrain_editor_view && view_offset.y > end.y && view_offset.y > previous_update_view_offset.y) {
view_offset.y = MAX(end.y, previous_update_view_offset.y); view_offset.y = MAX(end.y, previous_update_view_offset.y);
} }
if (view_offset.y < begin.y && view_offset.y < previous_update_view_offset.y) { if (constrain_editor_view && view_offset.y < begin.y && view_offset.y < previous_update_view_offset.y) {
view_offset.y = MIN(begin.y, previous_update_view_offset.y); view_offset.y = MIN(begin.y, previous_update_view_offset.y);
} }
@ -3637,16 +3638,16 @@ void CanvasItemEditor::_update_scrollbars() {
} }
if (canvas_item_rect.size.width <= (local_rect.size.x / zoom)) { if (canvas_item_rect.size.width <= (local_rect.size.x / zoom)) {
if (ABS(begin.x - previous_update_view_offset.x) < ABS(begin.x - view_offset.x)) { if (constrain_editor_view && ABS(begin.x - previous_update_view_offset.x) < ABS(begin.x - view_offset.x)) {
view_offset.x = previous_update_view_offset.x; view_offset.x = previous_update_view_offset.x;
} }
h_scroll->hide(); h_scroll->hide();
} else { } else {
if (view_offset.x > end.x && view_offset.x > previous_update_view_offset.x) { if (constrain_editor_view && view_offset.x > end.x && view_offset.x > previous_update_view_offset.x) {
view_offset.x = MAX(end.x, previous_update_view_offset.x); view_offset.x = MAX(end.x, previous_update_view_offset.x);
} }
if (view_offset.x < begin.x && view_offset.x < previous_update_view_offset.x) { if (constrain_editor_view && view_offset.x < begin.x && view_offset.x < previous_update_view_offset.x) {
view_offset.x = MIN(begin.x, previous_update_view_offset.x); view_offset.x = MIN(begin.x, previous_update_view_offset.x);
} }