Skip to content

Adjust panning multipliers #111305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −21
Open

Adjust panning multipliers #111305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions editor/animation/animation_state_machine_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,8 +563,8 @@ void AnimationNodeStateMachineEditor::_state_machine_gui_input(const Ref<InputEv

Ref<InputEventPanGesture> pan_gesture = p_event;
if (pan_gesture.is_valid()) {
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() * pan_gesture->get_delta().x / 8);
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() * pan_gesture->get_delta().y / 8);
h_scroll->set_value(h_scroll->get_value() + pan_gesture->get_delta().x * 5);
v_scroll->set_value(v_scroll->get_value() + pan_gesture->get_delta().y * 5);
}
}

Expand Down
2 changes: 1 addition & 1 deletion editor/scene/2d/tiles/tile_data_editors.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,7 +527,7 @@ void GenericTilePolygonEditor::_base_control_gui_input(Ref<InputEvent> p_event)

Ref<InputEventPanGesture> pan_gesture = p_event;
if (pan_gesture.is_valid()) {
panning += pan_gesture->get_delta() * 8;
panning += pan_gesture->get_delta() * 5 / 30;
drag_last_pos = Vector2();
button_center_view->set_disabled(panning.is_zero_approx());
accept_event();
Expand Down
4 changes: 2 additions & 2 deletions editor/scene/texture/texture_region_editor_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,8 +643,8 @@ void TextureRegionEditor::_texture_overlay_input(const Ref<InputEvent> &p_input)

Ref<InputEventPanGesture> pan_gesture = p_input;
if (pan_gesture.is_valid()) {
hscroll->set_value(hscroll->get_value() + hscroll->get_page() * pan_gesture->get_delta().x / 8);
vscroll->set_value(vscroll->get_value() + vscroll->get_page() * pan_gesture->get_delta().y / 8);
hscroll->set_value(hscroll->get_value() + pan_gesture->get_delta().x * 5);
vscroll->set_value(vscroll->get_value() + pan_gesture->get_delta().y * 5);
}
}

Expand Down
5 changes: 0 additions & 5 deletions platform/macos/godot_content_view.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,11 +887,6 @@ - (void)scrollWheel:(NSEvent *)event {
double delta_x = [event scrollingDeltaX];
double delta_y = [event scrollingDeltaY];

if ([event hasPreciseScrollingDeltas]) {
delta_x *= 0.03;
delta_y *= 0.03;
}

if ([event momentumPhase] != NSEventPhaseNone) {
if (ignore_momentum_scroll) {
return;
Expand Down
4 changes: 2 additions & 2 deletions scene/gui/item_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,8 +1164,8 @@ void ItemList::gui_input(const Ref<InputEvent> &p_event) {

Ref<InputEventPanGesture> pan_gesture = p_event;
if (pan_gesture.is_valid()) {
scroll_bar_v->set_value(scroll_bar_v->get_value() + scroll_bar_v->get_page() * pan_gesture->get_delta().y / 8);
scroll_bar_h->set_value(scroll_bar_h->get_value() + scroll_bar_h->get_page() * pan_gesture->get_delta().x / 8);
scroll_bar_v->set_value(scroll_bar_v->get_value() + pan_gesture->get_delta().y * 5);
scroll_bar_h->set_value(scroll_bar_h->get_value() + pan_gesture->get_delta().x * 5);
}

if (scroll_value_modified && (scroll_bar_v->get_value() != prev_scroll_v || scroll_bar_h->get_value() != prev_scroll_h)) {
Expand Down
2 changes: 1 addition & 1 deletion scene/gui/rich_text_label.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2795,7 +2795,7 @@ void RichTextLabel::gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventPanGesture> pan_gesture = p_event;
if (pan_gesture.is_valid()) {
if (scroll_active) {
vscroll->scroll(vscroll->get_page() * pan_gesture->get_delta().y * 0.5 / 8);
vscroll->scroll(pan_gesture->get_delta().y * 5 / 2);
queue_accessibility_update();
}

Expand Down
4 changes: 2 additions & 2 deletions scene/gui/scroll_container.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,10 +250,10 @@ void ScrollContainer::gui_input(const Ref<InputEvent> &p_gui_input) {
Ref<InputEventPanGesture> pan_gesture = p_gui_input;
if (pan_gesture.is_valid()) {
if (h_scroll_enabled) {
h_scroll->scroll(h_scroll->get_page() * pan_gesture->get_delta().x / ScrollBar::PAGE_DIVISOR);
h_scroll->scroll(pan_gesture->get_delta().x * 5);
}
if (v_scroll_enabled) {
v_scroll->scroll(v_scroll->get_page() * pan_gesture->get_delta().y / ScrollBar::PAGE_DIVISOR);
v_scroll->scroll(pan_gesture->get_delta().y * 5);
}

if (v_scroll->get_value() != prev_v_scroll || h_scroll->get_value() != prev_h_scroll) {
Expand Down
4 changes: 2 additions & 2 deletions scene/gui/text_edit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2494,13 +2494,13 @@ void TextEdit::gui_input(const Ref<InputEvent> &p_gui_input) {

const Ref<InputEventPanGesture> pan_gesture = p_gui_input;
if (pan_gesture.is_valid()) {
const real_t delta = pan_gesture->get_delta().y;
const real_t delta = pan_gesture->get_delta().y / 10;
if (delta < 0) {
_scroll_up(-delta, false);
} else {
_scroll_down(delta, false);
}
h_scroll->set_value(h_scroll->get_value() + pan_gesture->get_delta().x * 100);
h_scroll->set_value(h_scroll->get_value() + pan_gesture->get_delta().x * 5);
if (v_scroll->get_value() != prev_v_scroll || h_scroll->get_value() != prev_h_scroll) {
accept_event(); // Accept event if scroll changed.
}
Expand Down
6 changes: 3 additions & 3 deletions scene/gui/tree.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4201,13 +4201,13 @@ void Tree::gui_input(const Ref<InputEvent> &p_event) {
Ref<InputEventPanGesture> pan_gesture = p_event;
if (pan_gesture.is_valid()) {
double prev_v = v_scroll->get_value();
v_scroll->set_value(v_scroll->get_value() + v_scroll->get_page() * pan_gesture->get_delta().y / 8);
v_scroll->set_value(v_scroll->get_value() + pan_gesture->get_delta().y * 5);

double prev_h = h_scroll->get_value();
if (is_layout_rtl()) {
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() * -pan_gesture->get_delta().x / 8);
h_scroll->set_value(h_scroll->get_value() - pan_gesture->get_delta().x * 5);
} else {
h_scroll->set_value(h_scroll->get_value() + h_scroll->get_page() * pan_gesture->get_delta().x / 8);
h_scroll->set_value(h_scroll->get_value() + pan_gesture->get_delta().x * 5);
}

if (v_scroll->get_value() != prev_v || h_scroll->get_value() != prev_h) {
Expand Down
2 changes: 1 addition & 1 deletion scene/gui/view_panner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ bool ViewPanner::gui_input(const Ref<InputEvent> &p_event, Rect2 p_canvas_rect)
zoom_callback.call(zoom, pan_gesture->get_position(), p_event);
return true;
}
pan_callback.call(-pan_gesture->get_delta() * scroll_speed, p_event);
pan_callback.call(-pan_gesture->get_delta() / 10 * scroll_speed, p_event);
}

Ref<InputEventScreenDrag> screen_drag = p_event;
Expand Down