mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-03-11 02:21:45 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '3774_editor_buttons'

Browse Source
This commit is contained in:
Yury V. Zaytsev 2017-02-19 21:58:23 +01:00
commit 1a3ba4edbd
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/editor/editwidget.c
View File

@ -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)
{
@ -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;
@ -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) */