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

eeshow/gui.c: move style definitions to gui-style.h

Browse Source
This commit is contained in:
Werner Almesberger 2016-08-09 19:19:33 -03:00
parent ea3f98c569
commit 539f72b0d9
3 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeshow/gui-style.c
View File

@ -17,10 +17,6 @@
#define OVER_RADIUS 6 #define OVER_RADIUS 6
#define OVER_SEP 8 #define OVER_SEP 8
#define NORMAL_FONT "Helvetica 10"
#define BOLD_FONT "Helvetica Bold 10"
#define NORMAL_PAD 8 #define NORMAL_PAD 8
#define NORMAL_RADIUS 6 #define NORMAL_RADIUS 6
#define NORMAL_SKIP 8 #define NORMAL_SKIP 8

11
eeshow/gui-style.h
View File

@ -16,6 +16,17 @@
#include "gui-over.h" #include "gui-over.h"
#define NORMAL_FONT "Helvetica 10"
#define BOLD_FONT "Helvetica Bold 10"
#define FRAME_SEL_ONLY 0.0, 0.0, 0.0, 0.9
#define FRAME_SEL_OLD 0.8, 0.2, 0.2, 0.9
#define FRAME_SEL_NEW 0.0, 0.6, 0.0, 0.9
#define BG_NEW 0.6, 1.0, 0.6, 0.8
#define BG_OLD 1.0, 0.8, 0.8, 0.8
extern struct overlay_style overlay_style_default; extern struct overlay_style overlay_style_default;
extern struct overlay_style overlay_style_dense; extern struct overlay_style overlay_style_dense;
extern struct overlay_style overlay_style_diff_new; extern struct overlay_style overlay_style_diff_new;

18
eeshow/gui.c
View File

@ -397,14 +397,8 @@ static void hide_history(struct gui_ctx *ctx)
} }
#define NORMAL_FONT "Helvetica 10"
#define BOLD_FONT "Helvetica Bold 10"
#define FG_DIFF_NEW { 0.0, 0.6, 0.0, 1.0 }
#define FG_DIFF_OLD { 0.8, 0.0, 0.0, 1.0 }
#define COLOR(rgba) ((struct color) rgba)
#define RGBA(r, g, b, a) ((struct color) { (r), (g), (b), (a) }) #define RGBA(r, g, b, a) ((struct color) { (r), (g), (b), (a) })
#define COLOR(color) RGBA(color)
static void set_history_style(struct gui_hist *h, bool current) static void set_history_style(struct gui_hist *h, bool current)
@ -420,13 +414,13 @@ static void set_history_style(struct gui_hist *h, bool current)
switch (ctx->selecting) { switch (ctx->selecting) {
case sel_only: case sel_only:
style.frame = RGBA(0.0, 0.0, 0.0, 0.9); style.frame = COLOR(FRAME_SEL_ONLY);
break; break;
case sel_old: case sel_old:
style.frame = RGBA(0.8, 0.2, 0.2, 0.9); style.frame = COLOR(FRAME_SEL_OLD);
break; break;
case sel_new: case sel_new:
style.frame = RGBA(0.0, 0.6, 0.0, 0.9); style.frame = COLOR(FRAME_SEL_NEW);
break; break;
default: default:
abort(); abort();
@ -438,9 +432,9 @@ static void set_history_style(struct gui_hist *h, bool current)
} }
if (ctx->old_hist) { if (ctx->old_hist) {
if (h == new) if (h == new)
style.bg = RGBA(0.6, 1.0, 0.6, 0.8); style.bg = COLOR(BG_NEW);
if (h == old) if (h == old)
style.bg = RGBA(1.0, 0.8, 0.8, 0.8); style.bg = COLOR(BG_OLD);
} }
overlay_style(h->over, &style); overlay_style(h->over, &style);
} }