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

Add a slider to handle zoom

Browse source
This commit is contained in:
MarianoGNU 2016-01-18 22:10:44 -03:00
parent c2aaeaaf5a
commit 76ee2035b6
2 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
scene/gui/graph_edit.cpp
View file

@ -1,6 +1,7 @@
#include "graph_edit.h" #include "graph_edit.h"
#include "os/input.h" #include "os/input.h"
#include "os/keyboard.h" #include "os/keyboard.h"
#include "scene/gui/box_container.h"
bool GraphEditFilter::has_point(const Point2& p_point) const { bool GraphEditFilter::has_point(const Point2& p_point) const {
return ge->_filter_input(p_point); return ge->_filter_input(p_point);
@ -185,6 +186,8 @@ void GraphEdit::_notification(int p_what) {
h_scroll->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,hmin.height); h_scroll->set_anchor_and_margin(MARGIN_TOP,ANCHOR_END,hmin.height);
h_scroll->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,0); h_scroll->set_anchor_and_margin(MARGIN_BOTTOM,ANCHOR_END,0);
zoom_icon->set_texture( get_icon("Zoom", "EditorIcons"));
} }
if (p_what==NOTIFICATION_DRAW) { if (p_what==NOTIFICATION_DRAW) {
VS::get_singleton()->canvas_item_set_clip(get_canvas_item(),true); VS::get_singleton()->canvas_item_set_clip(get_canvas_item(),true);
@ -687,11 +690,11 @@ void GraphEdit::_input_event(const InputEvent& p_ev) {
} }
if (b.button_index==BUTTON_WHEEL_UP && b.pressed) { if (b.button_index==BUTTON_WHEEL_UP && b.pressed) {
set_zoom(zoom/0.9); sl_zoom->set_val(zoom/0.9);
} }
if (b.button_index==BUTTON_WHEEL_DOWN && b.pressed) { if (b.button_index==BUTTON_WHEEL_DOWN && b.pressed) {
set_zoom(zoom*0.9); sl_zoom->set_val(zoom*0.9);
} }
} }
@ -826,4 +829,19 @@ GraphEdit::GraphEdit() {
v_scroll->connect("value_changed", this,"_scroll_moved"); v_scroll->connect("value_changed", this,"_scroll_moved");
zoom = 1; zoom = 1;
HBoxContainer* tools = memnew( HBoxContainer );
add_child(tools);
zoom_icon = memnew( TextureFrame );
tools->add_child(zoom_icon);
sl_zoom = memnew( HSlider );
sl_zoom->set_min(0.01);
sl_zoom->set_max(4);
sl_zoom->set_val(1);
sl_zoom->set_step(0.01);
sl_zoom->connect("value_changed", this, "set_zoom");
tools->add_child(sl_zoom);
sl_zoom->set_custom_minimum_size(Size2(200,0));
} }

5
scene/gui/graph_edit.h
View file

@ -3,7 +3,8 @@
#include "scene/gui/graph_node.h" #include "scene/gui/graph_node.h"
#include "scene/gui/scroll_bar.h" #include "scene/gui/scroll_bar.h"
#include "scene/gui/slider.h"
#include "texture_frame.h"
class GraphEdit; class GraphEdit;
class GraphEditFilter : public Control { class GraphEditFilter : public Control {
@ -34,6 +35,8 @@ public:
}; };
private: private:
TextureFrame* zoom_icon;
HSlider* sl_zoom;
HScrollBar* h_scroll; HScrollBar* h_scroll;
VScrollBar* v_scroll; VScrollBar* v_scroll;