mirrors/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Require mouse release on top of frame button to trigger action

Browse Source 
As common UI convention, allows action to be avoided by dragging
outside the button after mouse press.
This commit is contained in:
Pekka Vuorela 2012-09-26 15:05:45 +03:00 committed by Kristian Høgsberg
parent 9b1018702d
commit 4e363d21bb
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
clients/window.c
View File

@ -1498,6 +1498,7 @@ frame_button_button_handler(struct widget *widget,
{ {
struct frame_button *frame_button = data; struct frame_button *frame_button = data;
struct window *window = widget->window; struct window *window = widget->window;
int was_pressed = (frame_button->state == FRAME_BUTTON_ACTIVE);
if (button != BTN_LEFT) if (button != BTN_LEFT)
return; return;
@ -1516,6 +1517,9 @@ frame_button_button_handler(struct widget *widget,
break; break;
} }
if (!was_pressed)
return;
switch (frame_button->type) { switch (frame_button->type) {
case FRAME_BUTTON_CLOSE: case FRAME_BUTTON_CLOSE:
if (window->close_handler) if (window->close_handler)
@ -1536,6 +1540,33 @@ frame_button_button_handler(struct widget *widget,
} }
} }
static int
frame_button_motion_handler(struct widget *widget,
struct input *input, uint32_t time,
float x, float y, void *data)
{
struct frame_button *frame_button = data;
enum frame_button_pointer previous_button_state = frame_button->state;
/* only track state for a pressed button */
if (input->grab != widget)
return CURSOR_LEFT_PTR;
if (x > widget->allocation.x &&
x < (widget->allocation.x + widget->allocation.width) &&
y > widget->allocation.y &&
y < (widget->allocation.y + widget->allocation.height)) {
frame_button->state = FRAME_BUTTON_ACTIVE;
} else {
frame_button->state = FRAME_BUTTON_DEFAULT;
}
if (frame_button->state != previous_button_state)
widget_schedule_redraw(frame_button->widget);
return CURSOR_LEFT_PTR;
}
static void static void
frame_button_redraw_handler(struct widget *widget, void *data) frame_button_redraw_handler(struct widget *widget, void *data)
{ {
@ -1612,6 +1643,7 @@ frame_button_create(struct frame *frame, void *data, enum frame_button_action ty
widget_set_enter_handler(frame_button->widget, frame_button_enter_handler); widget_set_enter_handler(frame_button->widget, frame_button_enter_handler);
widget_set_leave_handler(frame_button->widget, frame_button_leave_handler); widget_set_leave_handler(frame_button->widget, frame_button_leave_handler);
widget_set_button_handler(frame_button->widget, frame_button_button_handler); widget_set_button_handler(frame_button->widget, frame_button_button_handler);
widget_set_motion_handler(frame_button->widget, frame_button_motion_handler);
return frame_button->widget; return frame_button->widget;
} }