Skip to content

Commit 696068a

Browse files
committed
Added close button in edit dialog.
1 parent 0245a18 commit 696068a

2 files changed

Lines changed: 22 additions & 0 deletions

File tree

src/edit.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,18 @@ void editEvent(edit_t *ed, int evno, int ex, int ey)
337337
}
338338
}
339339
}
340+
341+
min_X = ed->box_X + ed->size_X - ed->layout_height;
342+
min_Y = ed->box_Y;
343+
344+
max_X = ed->box_X + ed->size_X - ed->layout_height / 4;
345+
max_Y = ed->box_Y + ed->layout_height;
346+
347+
if ( ed->cur_X > min_X && ed->cur_X < max_X
348+
&& ed->cur_Y > min_Y && ed->cur_Y < max_Y) {
349+
350+
ed->raised = 0;
351+
}
340352
}
341353
else if (evno == EDIT_EVNO_ARROW_LEFT) {
342354

@@ -466,6 +478,9 @@ void editDraw(edit_t *ed, SDL_Surface *surface)
466478
drawText(ed->dw, surface, ed->font, baseX, baseY, ed->title,
467479
TEXT_CENTERED, ed->sch->menu_item_text);
468480

481+
drawText(ed->dw, surface, ed->font, ed->box_X + ed->size_X - ed->layout_height,
482+
baseY, "x", TEXT_CENTERED_ON_Y, ed->sch->menu_item_text);
483+
469484
baseX = ed->box_X + ed->layout_height;
470485
baseY = ed->box_Y + 2 * ed->layout_height;
471486

src/gp.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4567,6 +4567,13 @@ gpEventHandle(gpcon_t *gp, const SDL_Event *ev)
45674567
gp->cur_Y = ev->button.y;
45684568

45694569
editEvent(ed, EDIT_EVNO_CLICK, gp->cur_X, gp->cur_Y);
4570+
4571+
if (ed->raised == 0) {
4572+
4573+
gp->stat = GP_IDLE;
4574+
4575+
SDL_StopTextInput();
4576+
}
45704577
}
45714578
}
45724579
}

0 commit comments

Comments
 (0)