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

Merge pull request #17111 from poke1024/fix16524

Browse source 
Fix grid mesh tile touch pad bug (issue 16524)
This commit is contained in:
Rémi Verschelde 2018-02-28 22:19:49 +01:00 committed by GitHub
commit 8df449100a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
modules/gridmap/grid_map_editor_plugin.cpp
View file

@ -641,12 +641,21 @@ bool GridMapEditor::forward_spatial_input_event(Camera *p_camera, const Ref<Inpu
Ref<InputEventPanGesture> pan_gesture = p_event; Ref<InputEventPanGesture> pan_gesture = p_event;
if (pan_gesture.is_valid()) { if (pan_gesture.is_valid()) {
if (pan_gesture->get_command() || pan_gesture->get_shift()) { if (pan_gesture->get_alt() && (pan_gesture->get_command() || pan_gesture->get_shift())) {
const real_t delta = pan_gesture->get_delta().y; const real_t delta = pan_gesture->get_delta().y * 0.5;
floor->set_value(floor->get_value() + SGN(delta)); accumulated_floor_delta += delta;
int step = 0;
if (ABS(accumulated_floor_delta) > 1.0) {
step = SGN(accumulated_floor_delta);
accumulated_floor_delta -= step;
}
if (step) {
floor->set_value(floor->get_value() + step);
}
return true; return true;
} }
} }
accumulated_floor_delta = 0.0;
return false; return false;
} }
@ -1247,6 +1256,7 @@ GridMapEditor::GridMapEditor(EditorNode *p_editor) {
selection.active = false; selection.active = false;
updating = false; updating = false;
accumulated_floor_delta = 0.0;
} }
GridMapEditor::~GridMapEditor() { GridMapEditor::~GridMapEditor() {

1
modules/gridmap/grid_map_editor_plugin.h
View file

@ -76,6 +76,7 @@ class GridMapEditor : public VBoxContainer {
Panel *panel; Panel *panel;
MenuButton *options; MenuButton *options;
SpinBox *floor; SpinBox *floor;
double accumulated_floor_delta;
ToolButton *mode_thumbnail; ToolButton *mode_thumbnail;
ToolButton *mode_list; ToolButton *mode_list;
HBoxContainer *spatial_editor_hb; HBoxContainer *spatial_editor_hb;