|
@@ -32,6 +32,7 @@
|
|
#include "os/keyboard.h"
|
|
#include "os/keyboard.h"
|
|
#include "globals.h"
|
|
#include "globals.h"
|
|
#include "os/input.h"
|
|
#include "os/input.h"
|
|
|
|
+#include "scene/main/viewport.h"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -814,6 +815,8 @@ void Tree::update_cache() {
|
|
cache.guide_width=get_constant("guide_width");
|
|
cache.guide_width=get_constant("guide_width");
|
|
cache.draw_relationship_lines=get_constant("draw_relationship_lines");
|
|
cache.draw_relationship_lines=get_constant("draw_relationship_lines");
|
|
cache.relationship_line_color=get_color("relationship_line_color");
|
|
cache.relationship_line_color=get_color("relationship_line_color");
|
|
|
|
+ cache.scroll_border=get_constant("scroll_border");
|
|
|
|
+ cache.scroll_speed=get_constant("scroll_speed");
|
|
|
|
|
|
cache.title_button = get_stylebox("title_button_normal");
|
|
cache.title_button = get_stylebox("title_button_normal");
|
|
cache.title_button_pressed = get_stylebox("title_button_pressed");
|
|
cache.title_button_pressed = get_stylebox("title_button_pressed");
|
|
@@ -2642,11 +2645,17 @@ void Tree::_notification(int p_what) {
|
|
if (p_what==NOTIFICATION_DRAG_END) {
|
|
if (p_what==NOTIFICATION_DRAG_END) {
|
|
|
|
|
|
drop_mode_flags=0;
|
|
drop_mode_flags=0;
|
|
|
|
+ scrolling = false;
|
|
|
|
+ set_fixed_process(false);
|
|
update();
|
|
update();
|
|
}
|
|
}
|
|
if (p_what==NOTIFICATION_DRAG_BEGIN) {
|
|
if (p_what==NOTIFICATION_DRAG_BEGIN) {
|
|
|
|
|
|
single_select_defer=NULL;
|
|
single_select_defer=NULL;
|
|
|
|
+ if (cache.scroll_speed > 0 && get_rect().has_point(get_viewport()->get_mouse_pos() - get_global_pos())) {
|
|
|
|
+ scrolling = true;
|
|
|
|
+ set_fixed_process(true);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
if (p_what==NOTIFICATION_FIXED_PROCESS) {
|
|
if (p_what==NOTIFICATION_FIXED_PROCESS) {
|
|
|
|
|
|
@@ -2692,6 +2701,28 @@ void Tree::_notification(int p_what) {
|
|
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if (scrolling) {
|
|
|
|
+ Point2 point = get_viewport()->get_mouse_pos() - get_global_pos();
|
|
|
|
+ if (point.x < cache.scroll_border) {
|
|
|
|
+ point.x -= cache.scroll_border;
|
|
|
|
+ } else if (point.x > get_size().width - cache.scroll_border) {
|
|
|
|
+ point.x -= get_size().width - cache.scroll_border;
|
|
|
|
+ } else {
|
|
|
|
+ point.x = 0;
|
|
|
|
+ }
|
|
|
|
+ if (point.y < cache.scroll_border) {
|
|
|
|
+ point.y -= cache.scroll_border;
|
|
|
|
+ } else if (point.y > get_size().height - cache.scroll_border) {
|
|
|
|
+ point.y -= get_size().height - cache.scroll_border;
|
|
|
|
+ } else {
|
|
|
|
+ point.y = 0;
|
|
|
|
+ }
|
|
|
|
+ point *= cache.scroll_speed * get_fixed_process_delta_time();
|
|
|
|
+ point += get_scroll();
|
|
|
|
+ h_scroll->set_val(point.x);
|
|
|
|
+ v_scroll->set_val(point.y);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
if (p_what==NOTIFICATION_DRAW) {
|
|
if (p_what==NOTIFICATION_DRAW) {
|