isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-08-09 01:44:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

frames: Use the triggering device when updating controls

Browse Source
This commit is contained in:
Carlos Garnacho
2011-07-27 00:29:32 +02:00
committed by Jasper St. Pierre
parent b742d1bc64
commit acbd4bf599
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/ui/frames.c
View File

@@ -51,6 +51,7 @@ static void meta_frames_unmap (GtkWidget *widget);
static void meta_frames_update_prelit_control (MetaFrames *frames, static void meta_frames_update_prelit_control (MetaFrames *frames,
MetaUIFrame *frame, MetaUIFrame *frame,
GdkDevice *device,
MetaFrameControl control); MetaFrameControl control);
static gboolean meta_frames_button_press_event (GtkWidget *widget, static gboolean meta_frames_button_press_event (GtkWidget *widget,
GdkEventButton *event); GdkEventButton *event);
@@ -1584,7 +1585,9 @@ meta_frames_button_release_event (GtkWidget *widget,
* prelit so to let the user know that it can now be pressed. * prelit so to let the user know that it can now be pressed.
* :) * :)
*/ */
meta_frames_update_prelit_control (frames, frame, control); meta_frames_update_prelit_control (frames, frame,
gdk_event_get_device ((GdkEvent *) event),
control);
} }
return TRUE; return TRUE;
@@ -1593,14 +1596,12 @@ meta_frames_button_release_event (GtkWidget *widget,
static void static void
meta_frames_update_prelit_control (MetaFrames *frames, meta_frames_update_prelit_control (MetaFrames *frames,
MetaUIFrame *frame, MetaUIFrame *frame,
GdkDevice *device,
MetaFrameControl control) MetaFrameControl control)
{ {
MetaFrameControl old_control; MetaFrameControl old_control;
GdkDevice *device;
MetaCursor cursor; MetaCursor cursor;
device = gtk_get_current_event_device ();
meta_verbose ("Updating prelit control from %u to %u\n", meta_verbose ("Updating prelit control from %u to %u\n",
frame->prelit_control, control); frame->prelit_control, control);
@@ -1769,7 +1770,9 @@ meta_frames_motion_notify_event (GtkWidget *widget,
control = META_FRAME_CONTROL_NONE; control = META_FRAME_CONTROL_NONE;
/* Update prelit control and cursor */ /* Update prelit control and cursor */
meta_frames_update_prelit_control (frames, frame, control); meta_frames_update_prelit_control (frames, frame,
gdk_event_get_device ((GdkEvent *) event),
control);
} }
break; break;
case META_GRAB_OP_NONE: case META_GRAB_OP_NONE:
@@ -1781,7 +1784,9 @@ meta_frames_motion_notify_event (GtkWidget *widget,
control = get_control (frames, frame, x, y); control = get_control (frames, frame, x, y);
/* Update prelit control and cursor */ /* Update prelit control and cursor */
meta_frames_update_prelit_control (frames, frame, control); meta_frames_update_prelit_control (frames, frame,
gdk_event_get_device ((GdkEvent *) event),
control);
} }
break; break;
@@ -2101,7 +2106,9 @@ meta_frames_enter_notify_event (GtkWidget *widget,
return FALSE; return FALSE;
control = get_control (frames, frame, event->x, event->y); control = get_control (frames, frame, event->x, event->y);
meta_frames_update_prelit_control (frames, frame, control); meta_frames_update_prelit_control (frames, frame,
gdk_event_get_device ((GdkEvent *) event),
control);
return TRUE; return TRUE;
} }
@@ -2119,7 +2126,9 @@ meta_frames_leave_notify_event (GtkWidget *widget,
if (frame == NULL) if (frame == NULL)
return FALSE; return FALSE;
meta_frames_update_prelit_control (frames, frame, META_FRAME_CONTROL_NONE); meta_frames_update_prelit_control (frames, frame,
gdk_event_get_device ((GdkEvent *) event),
META_FRAME_CONTROL_NONE);
return TRUE; return TRUE;
} }