diff options
| -rw-r--r-- | main.c | 2 | ||||
| -rw-r--r-- | ui.c | 5 | ||||
| -rw-r--r-- | ui.h | 2 | ||||
| -rw-r--r-- | widget.c | 6 | ||||
| -rw-r--r-- | widget.h | 2 |
5 files changed, 7 insertions, 10 deletions
@@ -415,7 +415,7 @@ comp_img(mu_Context *ctx, UI *ui) { mu_layout_set_next(ctx, img, 0); - w_image(ctx, &ui->comp_img); + w_canvas(ctx, &ui->comp_img); } static void @@ -92,7 +92,7 @@ void free_ui(UI *ui) { w_free_select_compressor(&ui->comp_select); free(ui->comps); - w_free_image(&ui->comp_img); + w_free_canvas(&ui->comp_img); } static void @@ -256,9 +256,8 @@ static int init_comp_img(UI *ui) { const Compressor *comp; - w_init_image(&ui->comp_img); comp = &ui->comps[ui->comp_select.idx]; - return w_set_image(&ui->comp_img, comp->imgfile); + return w_init_canvas(&ui->comp_img, comp->imgfile); } void @@ -48,7 +48,7 @@ typedef struct { int ncomps; w_Select_Compressor comp_select; - w_Image comp_img; + w_Canvas comp_img; } UI; int init_ui(UI *ui); @@ -354,8 +354,7 @@ w_free_canvas(w_Canvas *c) { c->icon_id = -1; } -/* Returns non-zero on error. */ -int +void w_canvas(mu_Context *ctx, w_Canvas *canvas) { int id, icon_id; mu_Rect r; @@ -367,10 +366,9 @@ w_canvas(mu_Context *ctx, w_Canvas *canvas) { icon_id = render_canvas(canvas); if (icon_id < 0) { weprintf("failed to render canvas"); - return 1; + return; } mu_draw_icon(ctx, icon_id, r, WHITE); - return 0; } /* Render the canvas if it is dirty. Returns the icon id, or -1 on error. */ @@ -84,4 +84,4 @@ typedef struct { int w_init_canvas(w_Canvas *c, const char *bg_img_path); void w_free_canvas(w_Canvas *c); -int w_canvas(mu_Context *ctx, w_Canvas *canvas); +void w_canvas(mu_Context *ctx, w_Canvas *canvas); |