summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO2
-rw-r--r--gui/common.h2
-rw-r--r--gui/sheet.c34
3 files changed, 26 insertions, 12 deletions
diff --git a/TODO b/TODO
index dac2c93..0219536 100644
--- a/TODO
+++ b/TODO
@@ -47,8 +47,6 @@ GUI:
to new_sheet and old_sheet.
GUI/history
-- revision selection is still a bit inconvenient and lacks quick way for
- showing un-diffed sheets. Should add "delta" button.
- use Tab to rapidly toggle between old/new sheet
- should have quick way to show diff of a single commit
- in history, set font to non-bold if showing details
diff --git a/gui/common.h b/gui/common.h
index 784704a..0d35814 100644
--- a/gui/common.h
+++ b/gui/common.h
@@ -95,7 +95,7 @@ struct gui_ctx {
struct gui_sheet *curr_sheet;
/* current sheet, always on new_hist */
- enum {
+ enum diff_mode {
diff_new, /* show only new sheet */
diff_old, /* show only old sheet */
diff_delta, /* show delta */
diff --git a/gui/sheet.c b/gui/sheet.c
index a25e3f8..5385850 100644
--- a/gui/sheet.c
+++ b/gui/sheet.c
@@ -139,6 +139,14 @@ static bool show_history_details(void *user, bool on)
}
+static void set_diff_mode(struct gui_ctx *ctx, enum diff_mode mode)
+{
+ ctx->diff_mode = mode;
+ do_revision_overlays(ctx);
+ redraw(ctx);
+}
+
+
static void show_history_cb(void *user)
{
struct gui_hist *h = user;
@@ -147,13 +155,11 @@ static void show_history_cb(void *user)
if (ctx->old_hist) {
if (h == ctx->new_hist && ctx->diff_mode != diff_new) {
- ctx->diff_mode = diff_new;
- redraw(ctx);
+ set_diff_mode(ctx, diff_new);
return;
}
if (h == ctx->old_hist && ctx->diff_mode != diff_old) {
- ctx->diff_mode = diff_old;
- redraw(ctx);
+ set_diff_mode(ctx, diff_old);
return;
}
sel = h == ctx->new_hist ? sel_new : sel_old;
@@ -166,8 +172,8 @@ static void show_diff_cb(void *user)
{
struct gui_ctx *ctx = user;
- ctx->diff_mode = diff_delta;
- redraw(ctx);
+ set_diff_mode(ctx,
+ ctx->diff_mode == diff_delta ? diff_new : diff_delta);
}
@@ -176,20 +182,30 @@ static void revision_overlays_diff(struct gui_ctx *ctx)
struct gui_hist *new = ctx->new_hist;
struct gui_hist *old = ctx->old_hist;
struct overlay *over;
+ struct overlay_style style;
new->over = overlay_add(&ctx->hist_overlays, &ctx->aois,
show_history_details, show_history_cb, new);
- overlay_style(new->over, &overlay_style_diff_new);
+ style = overlay_style_diff_new;
+ if (ctx->diff_mode == diff_new)
+ style.frame = RGBA(0, 0, 0, 1);
+ overlay_style(new->over, &style);
show_history_details(new, 0);
over = overlay_add(&ctx->hist_overlays, &ctx->aois,
NULL, show_diff_cb, ctx);
- overlay_style(over, &overlay_style_default);
+ style = overlay_style_default;
+ if (ctx->diff_mode == diff_delta)
+ style.frame = RGBA(0, 0, 0, 1);
+ overlay_style(over, &style);
overlay_text(over, "Δ");
old->over = overlay_add(&ctx->hist_overlays, &ctx->aois,
show_history_details, show_history_cb, old);
- overlay_style(old->over, &overlay_style_diff_old);
+ style = overlay_style_diff_old;
+ if (ctx->diff_mode == diff_old)
+ style.frame = RGBA(0, 0, 0, 1);
+ overlay_style(old->over, &style);
show_history_details(old, 0);
}