Team-Immerse-Yourself/YouDunIt
6
0
Fork 0
Code Issues Pull requests Projects 2 Releases Packages Wiki Activity Actions

feat: modules moved and engine moved to submodule

Browse source
This commit is contained in:
Jan van der Weide 2025-04-12 18:40:44 +02:00
parent dfb5e645cd
commit c33d2130cc
5136 changed files with 225275 additions and 64485 deletions
Download patch file Download diff file Expand all files Collapse all files

80
engine/scene/gui/scroll_container.cpp
View file

@ -353,14 +353,53 @@ void ScrollContainer::_reposition_children() {
queue_redraw();
}
void ScrollContainer::_accessibility_action_scroll_set(const Variant &p_data) {
const Point2 &pos = p_data;
h_scroll->set_value(pos.x);
v_scroll->set_value(pos.y);
}
void ScrollContainer::_accessibility_action_scroll_up(const Variant &p_data) {
v_scroll->set_value(v_scroll->get_value() - v_scroll->get_page() / 8);
}
void ScrollContainer::_accessibility_action_scroll_down(const Variant &p_data) {
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() / 8);
}
void ScrollContainer::_accessibility_action_scroll_left(const Variant &p_data) {
h_scroll->set_value(h_scroll->get_value() - h_scroll->get_page() / 8);
}
void ScrollContainer::_accessibility_action_scroll_right(const Variant &p_data) {
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() / 8);
}
void ScrollContainer::_notification(int p_what) {
switch (p_what) {
case NOTIFICATION_ACCESSIBILITY_UPDATE: {
RID ae = get_accessibility_element();
ERR_FAIL_COND(ae.is_null());
DisplayServer::get_singleton()->accessibility_update_set_role(ae, DisplayServer::AccessibilityRole::ROLE_SCROLL_VIEW);
DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_DOWN, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_down));
DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_LEFT, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_left));
DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_RIGHT, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_right));
DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SCROLL_UP, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_up));
DisplayServer::get_singleton()->accessibility_update_add_action(ae, DisplayServer::AccessibilityAction::ACTION_SET_SCROLL_OFFSET, callable_mp(this, &ScrollContainer::_accessibility_action_scroll_set));
} break;
case NOTIFICATION_ENTER_TREE:
case NOTIFICATION_THEME_CHANGED:
case NOTIFICATION_LAYOUT_DIRECTION_CHANGED:
case NOTIFICATION_TRANSLATION_CHANGED: {
_updating_scrollbars = true;
callable_mp(this, is_ready() ? &ScrollContainer::_reposition_children : &ScrollContainer::_update_scrollbar_position).call_deferred();
if (p_what == NOTIFICATION_THEME_CHANGED) {
scroll_border = get_theme_constant(SNAME("scroll_border"), SNAME("Tree"));
scroll_speed = get_theme_constant(SNAME("scroll_speed"), SNAME("Tree"));
}
} break;
case NOTIFICATION_READY: {
@ -387,6 +426,43 @@ void ScrollContainer::_notification(int p_what) {
}
} break;
case NOTIFICATION_DRAG_BEGIN: {
if (scroll_on_drag_hover && is_visible_in_tree()) {
set_process_internal(true);
}
} break;
case NOTIFICATION_DRAG_END: {
set_process_internal(false);
} break;
case NOTIFICATION_INTERNAL_PROCESS: {
if (scroll_on_drag_hover && get_viewport()->gui_is_dragging()) {
Point2 mouse_position = get_viewport()->get_mouse_position() - get_global_position();
Transform2D xform = get_transform();
if (Rect2(Point2(), xform.get_scale() * get_size()).grow(scroll_border).has_point(mouse_position)) {
Point2 point;
if ((Math::abs(mouse_position.x) < Math::abs(mouse_position.x - get_size().width)) && (Math::abs(mouse_position.x) < scroll_border)) {
point.x = mouse_position.x - scroll_border;
} else if (Math::abs(mouse_position.x - get_size().width) < scroll_border) {
point.x = mouse_position.x - (get_size().width - scroll_border);
}
if ((Math::abs(mouse_position.y) < Math::abs(mouse_position.y - get_size().height)) && (Math::abs(mouse_position.y) < scroll_border)) {
point.y = mouse_position.y - scroll_border;
} else if (Math::abs(mouse_position.y - get_size().height) < scroll_border) {
point.y = mouse_position.y - (get_size().height - scroll_border);
}
point *= scroll_speed * get_process_delta_time();
point += Point2(get_h_scroll(), get_v_scroll());
h_scroll->set_value(point.x);
v_scroll->set_value(point.y);
}
}
} break;
case NOTIFICATION_INTERNAL_PHYSICS_PROCESS: {
if (drag_touching) {
if (drag_touching_deaccel) {
@ -584,6 +660,10 @@ PackedStringArray ScrollContainer::get_configuration_warnings() const {
return warnings;
}
void ScrollContainer::set_scroll_on_drag_hover(bool p_scroll) {
scroll_on_drag_hover = p_scroll;
}
HScrollBar *ScrollContainer::get_h_scroll_bar() {
return h_scroll;
}