qi-hardware/eda-tools
1
0
Fork 0
mirror of git://projects.qi-hardware.com/eda-tools.git synced 2024-11-26 11:31:54 +02:00
Code

eeshow/gui.c: clicking outside the history list now closes it

Browse Source
This commit is contained in:
Werner Almesberger 2016-08-09 13:28:27 -03:00
parent bfd2ef39a2
commit afe744c63e
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
eeshow/gui.c
View File

@ -79,6 +79,8 @@ struct gui_ctx {
struct gui_hist *hist; /* revision history; NULL if none */ struct gui_hist *hist; /* revision history; NULL if none */
struct hist *vcs_hist; /* underlying VCS data; NULL if none */ struct hist *vcs_hist; /* underlying VCS data; NULL if none */
bool showing_history;
struct overlay *sheet_overlays; struct overlay *sheet_overlays;
struct overlay *hist_overlays; struct overlay *hist_overlays;
struct aoi *aois; /* areas of interest; in canvas coord */ struct aoi *aois; /* areas of interest; in canvas coord */
@ -396,9 +398,13 @@ static void setup_styles(void)
/* ----- Revision history -------------------------------------------------- */ /* ----- Revision history -------------------------------------------------- */
static void do_revision_overlays(struct gui_ctx *ctx);
static void hide_history(struct gui_ctx *ctx) static void hide_history(struct gui_ctx *ctx)
{ {
overlay_remove_all(&ctx->hist_overlays); ctx->showing_history = 0;
do_revision_overlays(ctx);
redraw(ctx); redraw(ctx);
} }
@ -422,10 +428,6 @@ static bool hover_history(void *user, bool on)
} }
//static void do_sheet_overlays(struct gui_ctx *ctx);
static void do_revision_overlays(struct gui_ctx *ctx);
static void go_to_history(struct gui_hist *h) static void go_to_history(struct gui_hist *h)
{ {
struct gui_ctx *ctx = h->ctx; struct gui_ctx *ctx = h->ctx;
@ -458,6 +460,7 @@ static void show_history(struct gui_ctx *ctx)
{ {
struct gui_hist *h = ctx->hist; struct gui_hist *h = ctx->hist;
ctx->showing_history = 1;
overlay_remove_all(&ctx->hist_overlays); overlay_remove_all(&ctx->hist_overlays);
for (h = ctx->hist; h; h = h->next) { for (h = ctx->hist; h; h = h->next) {
h->over = overlay_add(&ctx->hist_overlays, &ctx->aois, h->over = overlay_add(&ctx->hist_overlays, &ctx->aois,
@ -670,8 +673,11 @@ static gboolean button_press_event(GtkWidget *widget, GdkEventButton *event,
case 1: case 1:
if (aoi_click(ctx->aois, event->x, event->y)) if (aoi_click(ctx->aois, event->x, event->y))
break; break;
aoi_click(curr_sheet->aois, if (aoi_click(curr_sheet->aois,
x + curr_sheet->xmin, y + curr_sheet->ymin); x + curr_sheet->xmin, y + curr_sheet->ymin))
break;
if (ctx->showing_history)
hide_history(ctx);
break; break;
case 2: case 2:
pan_begin(ctx, event->x, event->y); pan_begin(ctx, event->x, event->y);
@ -976,6 +982,7 @@ int gui(unsigned n_args, char **args, bool recurse)
.panning = 0, .panning = 0,
.hist = NULL, .hist = NULL,
.vcs_hist = NULL, .vcs_hist = NULL,
.showing_history= 0,
.sheet_overlays = NULL, .sheet_overlays = NULL,
.hist_overlays = NULL, .hist_overlays = NULL,
.aois = NULL, .aois = NULL,