Relintai/pandemonium_engine
1
0
Fork 0
mirror of https://github.com/Relintai/pandemonium_engine.git synced 2025-01-25 18:39:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix PaintWindow with mouse emulation from touch.

Browse Source
This commit is contained in:
Relintai 2022-09-01 00:40:18 +02:00
parent c090c48f01
commit 2d543af173
2 changed files with 42 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
modules/paint/paint_window.cpp
View File

@ -250,6 +250,33 @@ void PaintWindow::_input(const Ref<InputEvent> &event) {
Ref<InputEventMouseButton> iemb = event; Ref<InputEventMouseButton> iemb = event;
if (iemb.is_valid()) { if (iemb.is_valid()) {
if (iemb->get_device() == InputEvent::DEVICE_ID_TOUCH_MOUSE) {
Vector2 mouse_position = paint_canvas->get_local_mouse_position();
Rect2 rect = Rect2(Vector2(0, 0), paint_canvas->get_size());
bool has_point = rect.has_point(mouse_position);
if (has_point && !paint_canvas->mouse_in_region) {
paint_canvas->mouse_in_region = true;
_on_PaintCanvasContainer_mouse_entered();
paint_canvas->_on_mouse_entered();
//_process(0.0000001);
int grid_size = paint_canvas->get_pixel_size();
mouse_position = get_global_mouse_position();
canvas_position = paint_canvas->get_global_position();
canvas_mouse_position = Vector2(mouse_position.x - canvas_position.x, mouse_position.y - canvas_position.y);
cell_mouse_position = Vector2(floor(canvas_mouse_position.x / grid_size), floor(canvas_mouse_position.y / grid_size));
cell_color = paint_canvas->get_pixel(cell_mouse_position.x, cell_mouse_position.y);
last_mouse_position = mouse_position;
last_canvas_position = canvas_position;
last_canvas_mouse_position = canvas_mouse_position;
last_cell_mouse_position = cell_mouse_position;
last_cell_color = cell_color;
_last_mouse_pos_canvas_area = get_global_mouse_position(); //paint_canvas_container_node.get_local_mouse_position()
}
}
if (brush_mode == Tools::CUT) { if (brush_mode == Tools::CUT) {
if (iemb->get_button_index() == BUTTON_LEFT && !iemb->is_pressed()) { if (iemb->get_button_index() == BUTTON_LEFT && !iemb->is_pressed()) {
commit_action(); commit_action();
@ -306,6 +333,19 @@ void PaintWindow::_input(const Ref<InputEvent> &event) {
break; break;
} }
} }
if (iemb->get_device() == InputEvent::DEVICE_ID_TOUCH_MOUSE) {
Vector2 mouse_position = paint_canvas->get_local_mouse_position();
Rect2 rect = Rect2(Vector2(0, 0), paint_canvas->get_size());
bool has_point = rect.has_point(mouse_position);
if (!has_point && paint_canvas->mouse_in_region) {
paint_canvas->mouse_in_region = false;
_on_PaintCanvasContainer_mouse_exited();
paint_canvas->_on_mouse_exited();
//_process(0.0000001);
}
}
} }
} }
void PaintWindow::_process(float delta) { void PaintWindow::_process(float delta) {
@ -1234,6 +1274,7 @@ PaintWindow::PaintWindow() {
mouse_in_region = false; mouse_in_region = false;
mouse_on_top = false; mouse_on_top = false;
mouse_from_touch = false;
_picked_color = false; _picked_color = false;

1
modules/paint/paint_window.h
View File

@ -249,6 +249,7 @@ public:
bool mouse_in_region; bool mouse_in_region;
bool mouse_on_top; bool mouse_on_top;
bool mouse_from_touch;
Vector2 _middle_mouse_pressed_pos; Vector2 _middle_mouse_pressed_pos;
Vector2 _middle_mouse_pressed_start_pos; Vector2 _middle_mouse_pressed_start_pos;