diff options
| author | Gilles Roudiere <gilles.roudiere@gmail.com> | 2017-08-19 18:29:37 +0200 |
|---|---|---|
| committer | Gilles Roudiere <gilles.roudiere@gmail.com> | 2017-09-17 23:04:30 +0200 |
| commit | 69091d40350d4f632384f0fd16a1df80071b0a37 (patch) | |
| tree | 8a1190daf0040e3d3bba637453b1a4ad326fb1da /editor/plugins/canvas_item_editor_plugin.h | |
| parent | 100c7888849ed384ef1a4788816cbf3b445ec1eb (diff) | |
Display draggable anchors only if the parent is not a container
Diffstat (limited to 'editor/plugins/canvas_item_editor_plugin.h')
| -rw-r--r-- | editor/plugins/canvas_item_editor_plugin.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/editor/plugins/canvas_item_editor_plugin.h b/editor/plugins/canvas_item_editor_plugin.h index ccb57f5c76..56f328c445 100644 --- a/editor/plugins/canvas_item_editor_plugin.h +++ b/editor/plugins/canvas_item_editor_plugin.h @@ -87,10 +87,7 @@ class CanvasItemEditor : public VBoxContainer { SNAP_RELATIVE, SNAP_CONFIGURE, SNAP_USE_PIXEL, - ZOOM_IN, - ZOOM_OUT, - ZOOM_RESET, - ZOOM_SET, + SHOW_HELPERS, LOCK_SELECTED, UNLOCK_SELECTED, GROUP_SELECTED, @@ -170,7 +167,12 @@ class CanvasItemEditor : public VBoxContainer { VScrollBar *v_scroll; HBoxContainer *hb; + ToolButton *zoom_minus; + ToolButton *zoom_reset; + ToolButton *zoom_plus; + Transform2D transform; + bool show_helpers; float zoom; Vector2 snap_offset; Vector2 snap_step; @@ -300,10 +302,6 @@ class CanvasItemEditor : public VBoxContainer { ConfirmationDialog *snap_dialog; - AcceptDialog *value_dialog; - Label *dialog_label; - SpinBox *dialog_val; - CanvasItem *ref_item; void _edit_set_pivot(const Vector2 &mouse_pos); @@ -330,7 +328,6 @@ class CanvasItemEditor : public VBoxContainer { void incend(float &beg, float &end, float inc, float minsize, bool p_symmetric); void _append_canvas_item(CanvasItem *p_item); - void _dialog_value_changed(double); void _snap_changed(); void _selection_result_pressed(int); void _selection_menu_hide(); @@ -361,6 +358,10 @@ class CanvasItemEditor : public VBoxContainer { void _set_anchors_preset(Control::LayoutPreset p_preset); void _set_full_rect(); + void _zoom_minus(); + void _zoom_reset(); + void _zoom_plus(); + HSplitContainer *palette_split; VSplitContainer *bottom_split; |