From fa951f8c5d8786554abc8bb1a7e1a88f0f03e01a Mon Sep 17 00:00:00 2001 From: Egmont Koblinger Date: Sun, 19 Feb 2017 19:47:18 +0100 Subject: [PATCH 1/2] Ticket #3774: mcedit - fix mouse active area for maximize / close buttons Signed-off-by: Yury V. Zaytsev Signed-off-by: Egmont Koblinger --- src/editor/editwidget.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c index 7f8554533..39a84137c 100644 --- a/src/editor/editwidget.c +++ b/src/editor/editwidget.c @@ -889,7 +889,7 @@ edit_dialog_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event) top = l; /* Handle fullscreen/close buttons in the top line */ - x = w->cols - 5; + x = w->cols - 6; if (top != NULL && event->x >= x) { @@ -1093,9 +1093,9 @@ edit_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event) { if (event->y == 0) { - if (event->x == close_x) + if (event->x >= close_x - 1 && event->x <= close_x + 1) ; /* do nothing (see MSG_MOUSE_CLICK) */ - else if (event->x == toggle_fullscreen_x) + else if (event->x >= toggle_fullscreen_x - 1 && event->x <= toggle_fullscreen_x + 1) ; /* do nothing (see MSG_MOUSE_CLICK) */ else { @@ -1125,9 +1125,9 @@ edit_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event) case MSG_MOUSE_CLICK: if (event->y == 0) { - if (event->x == close_x) + if (event->x >= close_x - 1 && event->x <= close_x + 1) send_message (w->owner, NULL, MSG_ACTION, CK_Close, NULL); - else if (event->x == toggle_fullscreen_x) + else if (event->x >= toggle_fullscreen_x - 1 && event->x <= toggle_fullscreen_x + 1) edit_toggle_fullscreen (edit); else if (!edit->fullscreen && event->count == GPM_DOUBLE) /* double click on top line (toggle fullscreen) */ From 256c3f1838d82ee380dbec57c6fe1c8171ea4d59 Mon Sep 17 00:00:00 2001 From: Mooffie Date: Sun, 19 Feb 2017 21:56:49 +0100 Subject: [PATCH 2/2] Improve comment for `dx` variable Signed-off-by: Yury V. Zaytsev Signed-off-by: Mooffie --- src/editor/editwidget.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/editor/editwidget.c b/src/editor/editwidget.c index 39a84137c..21d843d58 100644 --- a/src/editor/editwidget.c +++ b/src/editor/editwidget.c @@ -1057,7 +1057,7 @@ static void edit_mouse_callback (Widget * w, mouse_msg_t msg, mouse_event_t * event) { WEdit *edit = (WEdit *) w; - /* offset for top line */ + /* buttons' distance from right edge */ int dx = edit->fullscreen ? 0 : 2; /* location of 'Close' and 'Toggle fullscreen' pictograms */ int close_x, toggle_fullscreen_x;