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

Rename ScrollBar's drag_slave to drag_node

Browse Source
This commit is contained in:
Rémi Verschelde
2018-09-15 00:55:22 +02:00
parent 9b97c74f50
commit c25e23317c
3 changed files with 84 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
scene/gui/scroll_bar.h
View File

@ -36,6 +36,7 @@
/**
@author Juan Linietsky <reduzio@gmail.com>
*/
class ScrollBar : public Range {
GDCLASS(ScrollBar, Range);
@ -71,25 +72,25 @@ class ScrollBar : public Range {
static void set_can_focus_by_default(bool p_can_focus);
Node *drag_slave;
NodePath drag_slave_path;
Node *drag_node;
NodePath drag_node_path;
Vector2 drag_slave_speed;
Vector2 drag_slave_accum;
Vector2 drag_slave_from;
Vector2 last_drag_slave_accum;
float last_drag_slave_time;
Vector2 drag_node_speed;
Vector2 drag_node_accum;
Vector2 drag_node_from;
Vector2 last_drag_node_accum;
float last_drag_node_time;
float time_since_motion;
bool drag_slave_touching;
bool drag_slave_touching_deaccel;
bool drag_node_touching;
bool drag_node_touching_deaccel;
bool click_handled;
bool scrolling;
double target_scroll;
bool smooth_scroll_enabled;
void _drag_slave_exit();
void _drag_slave_input(const Ref<InputEvent> &p_input);
void _drag_node_exit();
void _drag_node_input(const Ref<InputEvent> &p_input);
void _gui_input(Ref<InputEvent> p_event);
@ -102,8 +103,8 @@ public:
void set_custom_step(float p_custom_step);
float get_custom_step() const;
void set_drag_slave(const NodePath &p_path);
NodePath get_drag_slave() const;
void set_drag_node(const NodePath &p_path);
NodePath get_drag_node() const;
void set_smooth_scroll_enabled(bool p_enable);
bool is_smooth_scroll_enabled() const;