smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 19:56:31 +01:00
Code Issues Projects Releases Wiki Activity

Fix touch-related canvas ptr grab

Browse source 
This fixes an issue when canvas left double button click
pops up a dialog. Focus needs to propagate to the dialog.

see also 05f3ac50cc
This commit is contained in:
Robin Gareus 2025-02-25 23:30:21 +01:00
parent 609f5c0112
commit cdb7c8c4d1
No known key found for this signature in database
GPG key ID: A090BCE02CF57F04
2 changed files with 14 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
libs/canvas/canvas.cc
View file

@ -547,6 +547,7 @@ GtkCanvas::GtkCanvas ()
, tooltip_window (0)
, _in_dtor (false)
, resize_queued (false)
, _ptr_grabbed (false)
, _nsglview (0)
{
#ifdef USE_CAIRO_IMAGE_SURFACE /* usually Windows builds */
@ -1232,7 +1233,13 @@ GtkCanvas::on_button_press_event (GdkEventButton* ev)
for scroll if this GtkCanvas is in a GtkCanvasViewport.
*/
if (ev->button == 1 && ev->type == GDK_BUTTON_PRESS) {
gdk_pointer_grab (ev->window,false, GdkEventMask( Gdk::POINTER_MOTION_MASK | Gdk::BUTTON_PRESS_MASK |Gdk::BUTTON_RELEASE_MASK), NULL,NULL,ev->time);
_ptr_grabbed = true;
} else if (_ptr_grabbed) {
gdk_pointer_ungrab (GDK_CURRENT_TIME);
_ptr_grabbed = false;
}
DEBUG_TRACE (PBD::DEBUG::CanvasEvents, string_compose ("canvas button press %1 @ %2, %3 => %4\n", ev->button, ev->x, ev->y, where));
return deliver_event (reinterpret_cast<GdkEvent*>(&copy));
@ -1256,7 +1263,11 @@ GtkCanvas::on_button_release_event (GdkEventButton* ev)
copy.button.x = where.x;
copy.button.y = where.y;
if (_ptr_grabbed) {
gdk_pointer_ungrab (GDK_CURRENT_TIME);
_ptr_grabbed = false;
}
/* Coordinates in the event will be canvas coordinates, correctly adjusted
for scroll if this GtkCanvas is in a GtkCanvasViewport.

1
libs/canvas/canvas/canvas.h
View file

@ -322,6 +322,7 @@ private:
bool _in_dtor;
bool resize_queued;
bool _ptr_grabbed;
void* _nsglview;
Cairo::RefPtr<Cairo::Surface> _canvas_image;