# HG changeset patch # User John Tsiombikas # Date 1303179009 -10800 # Node ID 6893b4dca5a38fcd9abad4e1c4bd371397db9727 # Parent df2bc94065617cc5a6ea36a605a32a19d4062951 added gradients on the selection diff -r df2bc9406561 -r 6893b4dca5a3 src/draw.c --- a/src/draw.c Tue Apr 19 03:01:46 2011 +0300 +++ b/src/draw.c Tue Apr 19 05:10:09 2011 +0300 @@ -13,11 +13,11 @@ {0.9, 0.9, 0.9, 1.0}, /* lit bevel */ {0.3, 0.3, 0.3, 1.0}, /* shadowed bevel */ {0.8, 0.25, 0.18, 1.0}, /* cursor color */ - {0.4, 0.5, 0.9, 1.0}, /* selection color */ + {0.68, 0.85, 1.3, 1.0}, /* selection color */ {0.75, 0.1, 0.095, 1.0} /* check color */ }; -static float focus_factor = 1.1; +static float focus_factor = 1.15; static float press_factor = 0.8; static float alpha = 1.0; static float bevel = 1.0; @@ -49,6 +49,11 @@ ret[1] *= press_factor; ret[2] *= press_factor; } + if(col & IMTK_SEL_BIT) { + ret[0] *= colors[IMTK_SELECTION_COLOR][0]; + ret[1] *= colors[IMTK_SELECTION_COLOR][1]; + ret[2] *= colors[IMTK_SELECTION_COLOR][2]; + } ret[3] *= alpha; return ret; } diff -r df2bc9406561 -r 6893b4dca5a3 src/imtk.h --- a/src/imtk.h Tue Apr 19 03:01:46 2011 +0300 +++ b/src/imtk.h Tue Apr 19 05:10:09 2011 +0300 @@ -33,9 +33,7 @@ #define IMTK_FOCUS_BIT 0x100 #define IMTK_PRESS_BIT 0x200 - -#define IMTK_BASE_COLOR IMTK_BOTTOM_COLOR -#define IMTK_FOCUS_COLOR (IMTK_TOP_COLOR | IMTK_FOCUS_BIT) +#define IMTK_SEL_BIT 0x400 #ifdef __cplusplus diff -r df2bc9406561 -r 6893b4dca5a3 src/progress.c --- a/src/progress.c Tue Apr 19 03:01:46 2011 +0300 +++ b/src/progress.c Tue Apr 19 05:10:09 2011 +0300 @@ -24,7 +24,7 @@ memcpy(tcol, imtk_get_color(IMTK_BOTTOM_COLOR), sizeof tcol); memcpy(bcol, imtk_get_color(IMTK_TOP_COLOR), sizeof bcol); - /* through */ + /* trough */ imtk_draw_rect(x - b, y - b, PROGR_SIZE + b * 2, PROGR_HEIGHT + b * 2, tcol, bcol); imtk_draw_frame(x - b, y - b, PROGR_SIZE + b * 2, PROGR_HEIGHT + b * 2, FRAME_INSET);