[Cgui-develop] cgui/src browsbar.c, 1.1.4.1, 1.1.4.2 cursor.c, 1.1.2.3.2.4, 1.1.2.3.2.5 filebrow.c,
Brought to you by:
chrisan,
rasmusmyklebust
Menu
▾
▴
[Cgui-develop] cgui/src browsbar.c, 1.1.4.1, 1.1.4.2 cursor.c, 1.1.2.3.2.4, 1.1.2.3.2.5 filebrow.c, 1.2.2.4.2.17, 1.2.2.4.2.18 files.c, 1.1.4.9, 1.1.4.10 files.h, 1.1.1.1.4.2, 1.1.1.1.4.3 graphini.c, 1.3.2.2.2.6, 1.3.2.2.2.7 list.c, 1.1.2.6.2.22, 1.1.2.6.2.23 menu.c, 1.1.4.3, 1.1.4.4 menubar.c, 1.1.2.1.2.2, 1.1.2.1.2.3 menuitem.c, 1.1.4.5, 1.1.4.6 menuitem.h, 1.1.1.1, 1.1.1.1.4.1 ndcont.c, 1.1.4.3, 1.1.4.4 ndresize.c, 1.1.4.2, 1.1.4.3 node.c, 1.1.2.1.2.8, 1.1.2.1.2.9 obbutton.c, 1.1.4.4, 1.1.4.5 obbutton.h, 1.1.1.1, 1.1.1.1.4.1 obcheck.c, 1.1, 1.1.4.1 obdrop.c, 1.1.4.3, 1.1.4.4 obedbox.c, 1.1.2.1.2.24, 1.1.2.1.2.25 obgroove.c, 1.1, 1.1.4.1 obheader.c, 1.1.4.5, 1.1.4.6 object.c, 1.1.2.2.2.15, 1.1.2.2.2.16 obmenrad.c, 1.1, 1.1.4.1 obprogr.c, 1.1.4.2, 1.1.4.3 obradio.c, 1.1.2.1.2.1, 1.1.2.1.2.2 obslider.c, 1.1.4.4, 1.1.4.5 obstatus.c, 1.1.4.1, 1.1.4.2 obtag.c, 1.1.4.1, 1.1.4.2 obtext.c, 1.1.2.3.2.11, 1.1.2.3.2.12 obtext.h, 1.1.1.1, 1.1.1.1.4.1 scroll.c, 1.1.4.1, 1.1.4.2 statelog.c, 1.1.4.1, 1.1.4.2 tabruler.c, 1.1, 1.1.4.1 tabs.c, 1.1.4.4, 1.1.4.5 tabwin.c, 1.1.2.1.2.2, 1.1.2.1.2.3 window.c, 1.1.2.2.2.7, 1.1.2.2.2.8 winscr.c, 1.1.4.4, 1.1.4.5
Update of /cvsroot/cgui/cgui/src In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv29155/src Modified Files: Tag: Branch_CGUI_1-6-7 browsbar.c cursor.c filebrow.c files.c files.h graphini.c list.c menu.c menubar.c menuitem.c menuitem.h ndcont.c ndresize.c node.c obbutton.c obbutton.h obcheck.c obdrop.c obedbox.c obgroove.c obheader.c object.c obmenrad.c obprogr.c obradio.c obslider.c obstatus.c obtag.c obtext.c obtext.h scroll.c statelog.c tabruler.c tabs.c tabwin.c window.c winscr.c Log Message: 2015895 More distinct look of the selected tab Index: cursor.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/cursor.c,v retrieving revision 1.1.2.3.2.4 retrieving revision 1.1.2.3.2.5 diff -C2 -d -r1.1.2.3.2.4 -r1.1.2.3.2.5 *** cursor.c 28 Sep 2007 22:17:00 -0000 1.1.2.3.2.4 --- cursor.c 14 Jul 2008 20:20:39 -0000 1.1.2.3.2.5 *************** *** 363,367 **** bmp = create_bitmap(w, h); clear_to_color(bmp, bitmap_mask_color(screen)); ! textout_ex(bmp, f, text, 0, 0, cgui_black, -1); OverlayPointer(bmp, w / 2, h / 2); destroy_bitmap(bmp); --- 363,367 ---- bmp = create_bitmap(w, h); clear_to_color(bmp, bitmap_mask_color(screen)); ! textout_ex(bmp, f, text, 0, 0, cgui_colors[CGUI_COLOR_DRAGGED_TEXT], -1); OverlayPointer(bmp, w / 2, h / 2); destroy_bitmap(bmp); Index: ndcont.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/ndcont.c,v retrieving revision 1.1.4.3 retrieving revision 1.1.4.4 diff -C2 -d -r1.1.4.3 -r1.1.4.4 *** ndcont.c 28 Jul 2007 21:01:39 -0000 1.1.4.3 --- ndcont.c 14 Jul 2008 20:20:44 -0000 1.1.4.4 *************** *** 44,55 **** static void DrawBorder(BITMAP * bmp, int x1, int y1, int x2, int y2) { ! hline(bmp, x1, y1, x2, cgui_dgray); // Top ! hline(bmp, x1 + 1, y1 + 1, x2, cgui_lgray); // Top+1 ! vline(bmp, x1, y1 + 1, y2, cgui_dgray); // Left ! vline(bmp, x1 + 1, y1 + 2, y2 - 1, cgui_lgray); // Left+1 ! hline(bmp, x1 + 2, y2 - 1, x2 - 1, cgui_dgray); // Bottom-1 ! hline(bmp, x1 + 1, y2, x2, cgui_lgray); // Bottom ! vline(bmp, x2 - 1, y1 + 2, y2 - 2, cgui_dgray); // Right-1 ! vline(bmp, x2, y1 + 2, y2 - 1, cgui_lgray); // Right } --- 44,55 ---- static void DrawBorder(BITMAP * bmp, int x1, int y1, int x2, int y2) { ! hline(bmp, x1, y1, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); // Top ! hline(bmp, x1 + 1, y1 + 1, x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); // Top+1 ! vline(bmp, x1, y1 + 1, y2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); // Left ! vline(bmp, x1 + 1, y1 + 2, y2 - 1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); // Left+1 ! hline(bmp, x1 + 2, y2 - 1, x2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); // Bottom-1 ! hline(bmp, x1 + 1, y2, x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); // Bottom ! vline(bmp, x2 - 1, y1 + 2, y2 - 2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); // Right-1 ! vline(bmp, x2, y1 + 2, y2 - 1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); // Right } *************** *** 83,95 **** y2 = b->y2; /* Fill space at top not occupide by the border-lines */ ! rectfill(bmp, x1, b->y1, x2, y1 - 1, cgui_gray); ! rectfill(bmp, x1 + CT_FRAME_WIDTH, y1 + CT_FRAME_WIDTH, ! x2 - CT_FRAME_WIDTH, b->y1 + h - 1, cgui_gray); DrawBorder(bmp, b->x1, y1, b->x2, b->y2); /* Now all frame-space is filled. We must rub the part of the border-line where we want to put the label */ ! rectfill(bmp, x1 + CT_LABEL_OFFSET - 2, y1, ! x1 + tw + CT_LABEL_OFFSET + 2, y1 + 1, cgui_gray); ! textout_ex(bmp, b->font, label, x1 + CT_LABEL_OFFSET, b->y1, cgui_black, -1); } --- 83,93 ---- y2 = b->y2; /* Fill space at top not occupide by the border-lines */ ! rectfill(bmp, x1, b->y1, x2, y1 - 1, cgui_colors[CGUI_COLOR_CONTAINER]); ! rectfill(bmp, x1 + CT_FRAME_WIDTH, y1 + CT_FRAME_WIDTH, x2 - CT_FRAME_WIDTH, b->y1 + h - 1, cgui_colors[CGUI_COLOR_CONTAINER]); DrawBorder(bmp, b->x1, y1, b->x2, b->y2); /* Now all frame-space is filled. We must rub the part of the border-line where we want to put the label */ ! rectfill(bmp, x1 + CT_LABEL_OFFSET - 2, y1, x1 + tw + CT_LABEL_OFFSET + 2, y1 + 1, cgui_colors[CGUI_COLOR_CONTAINER]); ! textout_ex(bmp, b->font, label, x1 + CT_LABEL_OFFSET, b->y1, cgui_colors[CGUI_COLOR_CONTAINER_LABEL], -1); } Index: obslider.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/obslider.c,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** obslider.c 6 Sep 2007 18:57:24 -0000 1.1.4.4 --- obslider.c 14 Jul 2008 20:20:59 -0000 1.1.4.5 *************** *** 57,61 **** x2 = b->x2; y2 = y1 + sl->scaleh - 1; ! rectfill(bmp, x1, y1, x2, y2, cgui_gray); x1 = b->x1 + sl->dx; x2 = x1 + sl->len - 1; --- 57,61 ---- x2 = b->x2; y2 = y1 + sl->scaleh - 1; ! rectfill(bmp, x1, y1, x2, y2, cgui_colors[CGUI_COLOR_CONTAINER]); x1 = b->x1 + sl->dx; x2 = x1 + sl->len - 1; *************** *** 89,94 **** x = x1 + i*(sl->len-1)/(double)n + 0.5; if (x != sx) { ! if ((x >= sx1 && x <= sx2) && scol == cgui_black) ! col = cgui_dgray; else col = scol; --- 89,94 ---- x = x1 + i*(sl->len-1)/(double)n + 0.5; if (x != sx) { ! if ((x >= sx1 && x <= sx2) && scol == cgui_colors[CGUI_COLOR_LABEL]) ! col = cgui_colors[CGUI_COLOR_SHADOWED_BORDER]; else col = scol; *************** *** 126,130 **** int len, x1, x2; ! rectfill(bmp, b->x1, b->y1, b->x2, b->y1+sl->labelh - 1, cgui_gray); len = sl->lstart; if (len/2 > sl->dx) --- 126,130 ---- int len, x1, x2; ! rectfill(bmp, b->x1, b->y1, b->x2, b->y1+sl->labelh - 1, cgui_colors[CGUI_COLOR_CONTAINER]); len = sl->lstart; if (len/2 > sl->dx) *************** *** 150,154 **** y1 = b->y1; y2 = b->y2; ! rectfill(bmp, x1, y1, x2, y2, cgui_gray); fh = text_height(b->font) / 2; y2 -= sl->dx + fh; --- 150,154 ---- y1 = b->y1; y2 = b->y2; ! rectfill(bmp, x1, y1, x2, y2, cgui_colors[CGUI_COLOR_CONTAINER]); fh = text_height(b->font) / 2; y2 -= sl->dx + fh; *************** *** 167,174 **** y2 = b->y2; /* draw frame */ ! hline(bmp, x1, y1, x2, cgui_dgray); ! vline(bmp, x1, y1+1, y2, cgui_dgray); ! hline(bmp, x1+1, y2, x2, cgui_lgray); ! vline(bmp, x2, y1+1, y2-1, cgui_lgray); /* Fill centre */ x1++; --- 167,174 ---- y2 = b->y2; /* draw frame */ ! hline(bmp, x1, y1, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(bmp, x1, y1+1, y2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(bmp, x1+1, y2, x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! vline(bmp, x2, y1+1, y2-1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); /* Fill centre */ x1++; *************** *** 176,180 **** x2--; y2--; ! rectfill(bmp, x1, y1, x2, y2, cgui_gray); /* Draw groove (3 pixels) */ x1 = b->x1 + sl->dx; --- 176,180 ---- x2--; y2--; ! rectfill(bmp, x1, y1, x2, y2, cgui_colors[CGUI_COLOR_CONTAINER]); /* Draw groove (3 pixels) */ x1 = b->x1 + sl->dx; *************** *** 191,204 **** y2 = y1 + sl->hh - 1; /* Outline */ ! hline(bmp, x1, y1, x2, cgui_lgray); ! hline(bmp, x1, y2, x2, cgui_dgray); ! vline(bmp, x1, y1 + 1, y2 - 1, cgui_lgray); ! vline(bmp, x2, y1 + 1, y2 - 1, cgui_dgray); /* Fill */ ! rectfill(bmp, x1+1, y1+1, x2-1, y2-1, cgui_gray); /* Mark center position */ ! vline(bmp, x, y1-1, y1+sl->hh/2, cgui_white); ! vline(bmp, x-1, y1, y1+sl->hh/2-1, cgui_lgray); ! vline(bmp, x+1, y1, y1+sl->hh/2-1, cgui_dgray); if (sl->scale) DrawScale(bmp, b, sl, scol); --- 191,204 ---- y2 = y1 + sl->hh - 1; /* Outline */ ! hline(bmp, x1, y1, x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! hline(bmp, x1, y2, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(bmp, x1, y1 + 1, y2 - 1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! vline(bmp, x2, y1 + 1, y2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); /* Fill */ ! rectfill(bmp, x1+1, y1+1, x2-1, y2-1, cgui_colors[CGUI_COLOR_CONTAINER]); /* Mark center position */ ! vline(bmp, x, y1-1, y1+sl->hh/2, cgui_colors[CGUI_COLOR_HEAVY_LIGHTENED_BORDER]); ! vline(bmp, x-1, y1, y1+sl->hh/2-1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! vline(bmp, x+1, y1, y1+sl->hh/2-1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); if (sl->scale) DrawScale(bmp, b, sl, scol); *************** *** 216,220 **** y2 = b->y2; /* Fill slider area */ ! rectfill(bmp, x1, y1, x2, y2, cgui_gray); /* Draw groove */ x1 = b->x1 + sl->dx; --- 216,220 ---- y2 = b->y2; /* Fill slider area */ ! rectfill(bmp, x1, y1, x2, y2, cgui_colors[CGUI_COLOR_CONTAINER]); /* Draw groove */ x1 = b->x1 + sl->dx; *************** *** 225,243 **** x = b->x1 + sl->dx + sl->x; vline(bmp, x, y1, y1 + 1, col); ! vline(bmp, x, y1 + 2, y1 + sl->hh, cgui_white); y = y1; for (x1 = x-1, y1 = y, i = 0; y1 <= y + sl->hh/2 + 1; y1++, x1-=i++&1) ! hline(bmp, x1, y1, x-1, cgui_lgray); x1++; i = 0; for (; y1 <= y + sl->hh; y1++, x1+=i++&1) ! hline(bmp, x1, y1, x-1, cgui_lgray); x++; for (x2 = x, y1 = y, i = 0; y1 <= y + sl->hh/2 + 1; y1++, x2+=i++&1) ! hline(bmp, x, y1, x2, cgui_dgray); x2--; i = 0; for (; y1 <= y + sl->hh; y1++, x2-=i++&1) ! hline(bmp, x, y1, x2, cgui_dgray); if (sl->scale) DrawScale(bmp, b, sl, scol); --- 225,243 ---- x = b->x1 + sl->dx + sl->x; vline(bmp, x, y1, y1 + 1, col); ! vline(bmp, x, y1 + 2, y1 + sl->hh, cgui_colors[CGUI_COLOR_HEAVY_LIGHTENED_BORDER]); y = y1; for (x1 = x-1, y1 = y, i = 0; y1 <= y + sl->hh/2 + 1; y1++, x1-=i++&1) ! hline(bmp, x1, y1, x-1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); x1++; i = 0; for (; y1 <= y + sl->hh; y1++, x1+=i++&1) ! hline(bmp, x1, y1, x-1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); x++; for (x2 = x, y1 = y, i = 0; y1 <= y + sl->hh/2 + 1; y1++, x2+=i++&1) ! hline(bmp, x, y1, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); x2--; i = 0; for (; y1 <= y + sl->hh; y1++, x2-=i++&1) ! hline(bmp, x, y1, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); if (sl->scale) DrawScale(bmp, b, sl, scol); *************** *** 246,250 **** } ! static void DrawSlider2(BITMAP *bmp, t_object *b, t_slider *sl, int col, int scol nouse) { int x1, y1, x2, y2, x; --- 246,250 ---- } ! static void DrawSlider2(BITMAP *bmp, t_object *b, t_slider *sl, int col, int scol) { int x1, y1, x2, y2, x; *************** *** 255,266 **** y2 = b->y2; /* Draw rails */ ! hline(bmp, x1, y1++, x2, cgui_gray); ! hline(bmp, x1, y1++, x2, cgui_lgray); ! hline(bmp, x1, y1++, x2, cgui_dgray); ! hline(bmp, x1, y2--, x2, cgui_gray); ! hline(bmp, x1, y2--, x2, cgui_dgray); ! hline(bmp, x1, y2--, x2, cgui_lgray); /* Fill slide area */ ! rectfill(bmp, x1, y1, x2, y2, cgui_gray); /* Draw handle */ x = b->x1 + sl->dx + sl->x; --- 255,266 ---- y2 = b->y2; /* Draw rails */ ! hline(bmp, x1, y1++, x2, cgui_colors[CGUI_COLOR_CONTAINER]); ! hline(bmp, x1, y1++, x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! hline(bmp, x1, y1++, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(bmp, x1, y2--, x2, cgui_colors[CGUI_COLOR_CONTAINER]); ! hline(bmp, x1, y2--, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(bmp, x1, y2--, x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); /* Fill slide area */ ! rectfill(bmp, x1, y1, x2, y2, cgui_colors[CGUI_COLOR_CONTAINER]); /* Draw handle */ x = b->x1 + sl->dx + sl->x; *************** *** 269,276 **** y1 = b->y1; y2 = b->y2; ! hline(bmp, x1, y1, x2, cgui_dgray); ! hline(bmp, x1, y2, x2, cgui_dgray); ! vline(bmp, x1, y1+1, y2-1, cgui_lgray); ! vline(bmp, x2, y1+1, y2-1, cgui_lgray); vline(bmp, x, y1+1, y2-1, col); /* Draw scale */ --- 269,276 ---- y1 = b->y1; y2 = b->y2; ! hline(bmp, x1, y1, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(bmp, x1, y2, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(bmp, x1, y1+1, y2-1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! vline(bmp, x2, y1+1, y2-1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); vline(bmp, x, y1+1, y2-1, col); /* Draw scale */ *************** *** 288,295 **** y2 = b->y2; /* draw frame */ ! hline(bmp, x1, y1, x2, cgui_dgray); ! vline(bmp, x1, y1+1, y2, cgui_dgray); ! hline(bmp, x1+1, y2, x2, cgui_lgray); ! vline(bmp, x2, y1+1, y2-1, cgui_lgray); /* Fill centre */ x1++; --- 288,295 ---- y2 = b->y2; /* draw frame */ ! hline(bmp, x1, y1, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(bmp, x1, y1+1, y2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(bmp, x1+1, y2, x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! vline(bmp, x2, y1+1, y2-1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); /* Fill centre */ x1++; *************** *** 297,301 **** x2--; y2--; ! rectfill(bmp, x1, y1, x2, y2, cgui_gray); /* Draw groove */ y1 = b->y2 - sl->dx; --- 297,301 ---- x2--; y2--; ! rectfill(bmp, x1, y1, x2, y2, cgui_colors[CGUI_COLOR_CONTAINER]); /* Draw groove */ y1 = b->y2 - sl->dx; *************** *** 310,324 **** y2 = y1 + sl->hw - 1; /* ..outline.. */ ! hline(bmp, x1, y1, x2, cgui_lgray); ! hline(bmp, x1, y2, x2, cgui_dgray); ! vline(bmp, x1, y1 + 1, y2 - 1, cgui_lgray); ! vline(bmp, x2, y1 + 1, y2 - 1, cgui_dgray); /* ..fill.. */ ! rectfill(bmp, x1+1, y1+1, x2-1, y2-1, cgui_gray); /* ..groove */ ! hline(bmp, x1+1, y-1, x2-1, cgui_lgray); ! hline(bmp, x1+1, y, x2-1, cgui_white); ! hline(bmp, x1+1, y+1, x2-1, cgui_dgray); ! if (col == cgui_blue) { putpixel(bmp, x1, y, col); putpixel(bmp, x2, y, col); --- 310,324 ---- y2 = y1 + sl->hw - 1; /* ..outline.. */ ! hline(bmp, x1, y1, x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! hline(bmp, x1, y2, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(bmp, x1, y1 + 1, y2 - 1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! vline(bmp, x2, y1 + 1, y2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); /* ..fill.. */ ! rectfill(bmp, x1+1, y1+1, x2-1, y2-1, cgui_colors[CGUI_COLOR_CONTAINER]); /* ..groove */ ! hline(bmp, x1+1, y-1, x2-1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! hline(bmp, x1+1, y, x2-1, cgui_colors[CGUI_COLOR_HEAVY_LIGHTENED_BORDER]); ! hline(bmp, x1+1, y+1, x2-1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! if (col == cgui_colors[CGUI_COLOR_LABEL_FOCUS]) { putpixel(bmp, x1, y, col); putpixel(bmp, x2, y, col); *************** *** 371,385 **** return; if (b->inactive) ! col = scol = cgui_lgray; else if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_lblue; else ! col = cgui_blue; ! scol = cgui_black; } else ! col = scol = cgui_black; sl = b->appdata; ! CalcPositionFromValue(sl); /* If the value did change, we must update eventual hooked on numeric viewer */ sl->Draw(bmp, b, sl, col, scol); --- 371,388 ---- return; if (b->inactive) ! col = cgui_colors[CGUI_COLOR_LABEL_INACTIVE_1]; else if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_colors[CGUI_COLOR_LABEL_HIDDEN_FOCUS]; else ! col = cgui_colors[CGUI_COLOR_LABEL_FOCUS]; } else ! col = cgui_colors[CGUI_COLOR_LABEL]; ! if (b->inactive) ! scol = cgui_colors[CGUI_COLOR_LABEL_INACTIVE_1]; ! else ! scol = cgui_colors[CGUI_COLOR_LABEL]; sl = b->appdata; ! CalcPositionFromValue(sl); /* If the value did change, we must update eventual hooked on numeric viewer */ sl->Draw(bmp, b, sl, col, scol); Index: obbutton.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/obbutton.c,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** obbutton.c 7 Oct 2007 16:37:22 -0000 1.1.4.4 --- obbutton.c 14 Jul 2008 20:20:44 -0000 1.1.4.5 *************** *** 36,40 **** DrawImage(im, b->parent->bmp, x, y); if (disp) ! hline(b->parent->bmp, b->x1 + 2, b->y1 + 2, b->x2 - 1, cgui_gray); } } --- 36,40 ---- DrawImage(im, b->parent->bmp, x, y); if (disp) ! hline(b->parent->bmp, b->x1 + 2, b->y1 + 2, b->x2 - 1, cgui_colors[CGUI_COLOR_WIDGET_BACKGROUND]); } } *************** *** 50,61 **** bmp = b->parent->bmp;; if (b->inactive) ! col = cgui_lgray; else if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_lblue; else ! col = cgui_blue; } else ! col = cgui_black; if (center) { --- 50,61 ---- bmp = b->parent->bmp;; if (b->inactive) ! col = cgui_colors[CGUI_COLOR_LABEL_INACTIVE_1]; else if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_colors[CGUI_COLOR_LABEL_HIDDEN_FOCUS]; else ! col = cgui_colors[CGUI_COLOR_LABEL_FOCUS]; } else ! col = cgui_colors[CGUI_COLOR_LABEL]; if (center) { *************** *** 71,80 **** set_clip_rect(bmp, bmp->cl, bmp->ct, b->x2 - 2, bmp->cb); if (b->inactive) ! textout_ex(bmp, b->font, label, x+1, y+1, cgui_dgray, -1); textout_ex(bmp, b->font, label, x, y, col, -1); set_clip_rect(bmp, bmp->cl, bmp->ct, clip_x2, bmp->cb); } else { if (b->inactive) ! textout_ex(bmp, b->font, label, x+1, y+1, cgui_dgray, -1); textout_ex(bmp, b->font, label, x, y, col, -1); } --- 71,80 ---- set_clip_rect(bmp, bmp->cl, bmp->ct, b->x2 - 2, bmp->cb); if (b->inactive) ! textout_ex(bmp, b->font, label, x+1, y+1, cgui_colors[CGUI_COLOR_LABEL_INACTIVE_2], -1); textout_ex(bmp, b->font, label, x, y, col, -1); set_clip_rect(bmp, bmp->cl, bmp->ct, clip_x2, bmp->cb); } else { if (b->inactive) ! textout_ex(bmp, b->font, label, x+1, y+1, cgui_colors[CGUI_COLOR_LABEL_INACTIVE_2], -1); textout_ex(bmp, b->font, label, x, y, col, -1); } *************** *** 96,107 **** return; if (b->inactive) ! col = cgui_lgray; else if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_lblue; else ! col = cgui_blue; } else ! col = cgui_black; width = x2 - x1 + 1; dy = text_height(b->font) + 1; /* extra pixel for underlining */ --- 96,107 ---- return; if (b->inactive) ! col = cgui_colors[CGUI_COLOR_LABEL_INACTIVE_1]; else if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_colors[CGUI_COLOR_LABEL_HIDDEN_FOCUS]; else ! col = cgui_colors[CGUI_COLOR_LABEL_FOCUS]; } else ! col = cgui_colors[CGUI_COLOR_LABEL]; width = x2 - x1 + 1; dy = text_height(b->font) + 1; /* extra pixel for underlining */ *************** *** 122,126 **** } if (b->inactive) ! textout_ex(bmp, b->font, tag, x+1, y+1, cgui_dgray, -1); textout_ex(bmp, b->font, tag, x, y, col, -1); if (b->hkrow == i && b->hklen) { --- 122,126 ---- } if (b->inactive) ! textout_ex(bmp, b->font, tag, x+1, y+1, cgui_colors[CGUI_COLOR_LABEL_INACTIVE_2], -1); textout_ex(bmp, b->font, tag, x, y, col, -1); if (b->hkrow == i && b->hklen) { *************** *** 137,147 **** if (bmp == NULL) return; ! hline(bmp, x1, y1, x2, cgui_black); ! hline(bmp, x1 + 1, y1 + 1, x2 - 1, cgui_dgray); ! vline(bmp, x1, y1 + 1, y2 - 1, cgui_black); ! vline(bmp, x1 + 1, y1 + 2, y2 - 1, cgui_dgray); ! hline(bmp, x1, y2, x2, cgui_white); ! vline(bmp, x2, y1 + 1, y2 - 1, cgui_white); } --- 137,147 ---- if (bmp == NULL) return; ! hline(bmp, x1, y1, x2, cgui_colors[CGUI_COLOR_HEAVY_SHADOWED_BORDER]); ! hline(bmp, x1 + 1, y1 + 1, x2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(bmp, x1, y1 + 1, y2 - 1, cgui_colors[CGUI_COLOR_HEAVY_SHADOWED_BORDER]); ! vline(bmp, x1 + 1, y1 + 2, y2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(bmp, x1, y2, x2, cgui_colors[CGUI_COLOR_HEAVY_LIGHTENED_BORDER]); ! vline(bmp, x2, y1 + 1, y2 - 1, cgui_colors[CGUI_COLOR_HEAVY_LIGHTENED_BORDER] ); } *************** *** 155,173 **** return; if (indic) ! col = cgui_blue; else ! col = cgui_dgray; ! hline(bmp, x1, y1, x2, cgui_white); ! hline(bmp, x1 + 1, y1 + 1, x2 - 1, cgui_lgray); ! vline(bmp, x1, y1 + 1, y2 - 1, cgui_white); ! vline(bmp, x1 + 1, y1 + 2, y2 - 2, cgui_lgray); ! /* draw to bottom edge */ ! hline(bmp, x1, y2, x2, cgui_black); hline(bmp, x1 + 1, y2 - 1, x2 - 1, col); ! /* draw to right edge */ ! vline(bmp, x2, y1 + 1, y2 - 1, cgui_black); vline(bmp, x2 - 1, y1 + 2, y2 - 2, col); } --- 155,176 ---- return; if (indic) ! col = cgui_colors[CGUI_COLOR_BUTTON_FRAME_FOCUS]; else ! col = cgui_colors[CGUI_COLOR_SHADOWED_BORDER]; + /* Top */ + hline(bmp, x1, y1, x2, cgui_colors[CGUI_COLOR_HEAVY_LIGHTENED_BORDER]); + hline(bmp, x1 + 1, y1 + 1, x2 - 1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! /* Left */ ! vline(bmp, x1, y1 + 1, y2 - 1, cgui_colors[CGUI_COLOR_HEAVY_LIGHTENED_BORDER]); ! vline(bmp, x1 + 1, y1 + 2, y2 - 2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! ! /* Bottom */ ! hline(bmp, x1, y2, x2, cgui_colors[CGUI_COLOR_HEAVY_SHADOWED_BORDER]); hline(bmp, x1 + 1, y2 - 1, x2 - 1, col); ! /* Right */ ! vline(bmp, x2, y1 + 1, y2 - 1, cgui_colors[CGUI_COLOR_HEAVY_SHADOWED_BORDER]); vline(bmp, x2 - 1, y1 + 2, y2 - 2, col); } Index: obheader.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/obheader.c,v retrieving revision 1.1.4.5 retrieving revision 1.1.4.6 diff -C2 -d -r1.1.4.5 -r1.1.4.6 *** obheader.c 7 Oct 2007 16:37:22 -0000 1.1.4.5 --- obheader.c 14 Jul 2008 20:20:44 -0000 1.1.4.6 *************** *** 34,41 **** extern void DrawThinFrame(BITMAP *bmp, int x1, int y1, int x2, int y2) { ! hline(bmp, x1, y1, x2, cgui_dgray); ! vline(bmp, x1, y1, y2, cgui_dgray); ! hline(bmp, x1, y2, x2, cgui_lgray); ! vline(bmp, x2, y1, y2, cgui_lgray); } --- 34,41 ---- extern void DrawThinFrame(BITMAP *bmp, int x1, int y1, int x2, int y2) { ! hline(bmp, x1, y1, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(bmp, x1, y1, y2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(bmp, x1, y2, x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! vline(bmp, x2, y1, y2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); } *************** *** 55,63 **** if (ofs < HEADERFRAME + HEADERSPACE) ofs = HEADERFRAME + HEADERSPACE; ! rect(bmp, x1, y1, x2, y2, cgui_gray); ! rect(bmp, x1 + 1, y1 + 1, x2 - 1, y2 - 1, cgui_gray); DrawThinFrame(bmp, x1+2, y1+2, x2-2, y2-2); ! rectfill(bmp, x1 + HEADERFRAME, y1 + HEADERFRAME, x2 - HEADERFRAME, ! y2 - HEADERFRAME, bcol); cl = bmp->cl; cr = bmp->cr; --- 55,62 ---- if (ofs < HEADERFRAME + HEADERSPACE) ofs = HEADERFRAME + HEADERSPACE; ! rect(bmp, x1, y1, x2, y2, cgui_colors[CGUI_COLOR_CONTAINER]); ! rect(bmp, x1 + 1, y1 + 1, x2 - 1, y2 - 1, cgui_colors[CGUI_COLOR_CONTAINER]); DrawThinFrame(bmp, x1+2, y1+2, x2-2, y2-2); ! rectfill(bmp, x1 + HEADERFRAME, y1 + HEADERFRAME, x2 - HEADERFRAME, y2 - HEADERFRAME, bcol); cl = bmp->cl; cr = bmp->cr; *************** *** 74,80 **** return; if (b->hasfocus) { ! DrawFramedLabel(b->label, b, cgui_white, cgui_dblue); } else { ! DrawFramedLabel(b->label, b, cgui_lgray, cgui_dgray); } } --- 73,79 ---- return; if (b->hasfocus) { ! DrawFramedLabel(b->label, b, cgui_colors[CGUI_COLOR_TITLE_FOCUS_TEXT], cgui_colors[CGUI_COLOR_TITLE_FOCUS_BACKGROUND]); } else { ! DrawFramedLabel(b->label, b, cgui_colors[CGUI_COLOR_TITLE_UNFOCUS_TEXT], cgui_colors[CGUI_COLOR_TITLE_UNFOCUS_BACKGROUND]); } } *************** *** 95,100 **** b->x1 = b->y1 = 0; b->y2 = text_height(b->font) - 1 + HEADERFRAME * 2 + HEADERSPACE * 2; ! b->x2 = text_length(b->font, b->label) - 1 + HEADERFRAME * 2 + ! HEADERSPACE * 2; } --- 94,98 ---- b->x1 = b->y1 = 0; b->y2 = text_height(b->font) - 1 + HEADERFRAME * 2 + HEADERSPACE * 2; ! b->x2 = text_length(b->font, b->label) - 1 + HEADERFRAME * 2 + HEADERSPACE * 2; } Index: obmenrad.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/Attic/obmenrad.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** obmenrad.c 2 Mar 2003 17:45:17 -0000 1.1 --- obmenrad.c 14 Jul 2008 20:20:45 -0000 1.1.4.1 *************** *** 24,30 **** y = b->y1 + 4; if (b->inactive) ! col = cgui_gray; else ! col = cgui_black; hline(b->parent->bmp, x + 1, y + 5, x + 2, col); hline(b->parent->bmp, x, y + 6, x + 3, col); --- 24,30 ---- y = b->y1 + 4; if (b->inactive) ! col = cgui_colors[CGUI_COLOR_LABEL_INACTIVE_1]; else ! col = cgui_colors[CGUI_COLOR_LABEL]; hline(b->parent->bmp, x + 1, y + 5, x + 2, col); hline(b->parent->bmp, x, y + 6, x + 3, col); Index: winscr.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/winscr.c,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** winscr.c 25 Dec 2007 11:41:43 -0000 1.1.4.4 --- winscr.c 14 Jul 2008 20:20:59 -0000 1.1.4.5 *************** *** 38,42 **** } } else { ! clear_to_color(nd->bmp, makecol(0, 130, 130)); } } --- 38,42 ---- } } else { ! clear_to_color(nd->bmp, cgui_colors[CGUI_COLOR_DESKTOP]); } } Index: obbutton.h =================================================================== RCS file: /cvsroot/cgui/cgui/src/obbutton.h,v retrieving revision 1.1.1.1 retrieving revision 1.1.1.1.4.1 diff -C2 -d -r1.1.1.1 -r1.1.1.1.4.1 *** obbutton.h 2 Mar 2003 17:24:24 -0000 1.1.1.1 --- obbutton.h 14 Jul 2008 20:20:44 -0000 1.1.1.1.4.1 *************** *** 10,14 **** extern void ButtonFrame(struct BITMAP *bmp, int x1, int y1, int x2, int y2, int indic); ! #define FillText(b, disp) rectfill(b->parent->bmp, b->x1+2, b->y1+2, b->x2-2+disp, b->y2-2+disp, cgui_gray) #define ButtonTextC(dx, dy, b, s) ButtonText1(dx, dy, b, 1, s) #define ButtonTextL(dx, dy, b, s) ButtonText1(dx, dy, b, 0, s) --- 10,14 ---- extern void ButtonFrame(struct BITMAP *bmp, int x1, int y1, int x2, int y2, int indic); ! #define FillText(b, disp) rectfill(b->parent->bmp, b->x1+2, b->y1+2, b->x2-2+disp, b->y2-2+disp, cgui_colors[CGUI_COLOR_WIDGET_BACKGROUND]) #define ButtonTextC(dx, dy, b, s) ButtonText1(dx, dy, b, 1, s) #define ButtonTextL(dx, dy, b, s) ButtonText1(dx, dy, b, 0, s) Index: obradio.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/obradio.c,v retrieving revision 1.1.2.1.2.1 retrieving revision 1.1.2.1.2.2 diff -C2 -d -r1.1.2.1.2.1 -r1.1.2.1.2.2 *** obradio.c 7 Oct 2007 16:37:22 -0000 1.1.2.1.2.1 --- obradio.c 14 Jul 2008 20:20:59 -0000 1.1.2.1.2.2 *************** *** 57,71 **** DisplayBitmap(b, 2); ! hline(b->parent->bmp, x1, y1, x2, cgui_black); ! vline(b->parent->bmp, x1, y1 + 1, y2, cgui_black); ! hline(b->parent->bmp, x1 + 1, y1 + 1, x2 - 1, cgui_dgray); ! vline(b->parent->bmp, x1 + 1, y1 + 1, y2 - 1, cgui_dgray); ! hline(b->parent->bmp, x1 + 2, y1 + 2, x2 - 1, cgui_dgray); ! vline(b->parent->bmp, x1 + 2, y1 + 3, y2 - 1, cgui_dgray); ! hline(b->parent->bmp, x1 + 1, y2, x2, cgui_white); ! vline(b->parent->bmp, x2, y1 + 1, y2 - 1, cgui_white); } --- 57,71 ---- DisplayBitmap(b, 2); ! hline(b->parent->bmp, x1, y1, x2, cgui_colors[CGUI_COLOR_HEAVY_SHADOWED_BORDER]); ! vline(b->parent->bmp, x1, y1 + 1, y2, cgui_colors[CGUI_COLOR_HEAVY_SHADOWED_BORDER]); ! hline(b->parent->bmp, x1 + 1, y1 + 1, x2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(b->parent->bmp, x1 + 1, y1 + 1, y2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(b->parent->bmp, x1 + 2, y1 + 2, x2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(b->parent->bmp, x1 + 2, y1 + 3, y2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(b->parent->bmp, x1 + 1, y2, x2, cgui_colors[CGUI_COLOR_HEAVY_LIGHTENED_BORDER]); ! vline(b->parent->bmp, x2, y1 + 1, y2 - 1, cgui_colors[CGUI_COLOR_HEAVY_LIGHTENED_BORDER]); } Index: obstatus.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/obstatus.c,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** obstatus.c 28 Mar 2005 17:24:18 -0000 1.1.4.1 --- obstatus.c 14 Jul 2008 20:20:59 -0000 1.1.4.2 *************** *** 46,50 **** st->FormatFunc(st->data, s); DrawThinFrame(bmp, x1, y1, x2, y2); ! rectfill(bmp, x1 + 1, y1 + 1, x2 - 1, y2 - 1, cgui_gray); cl = bmp->cl; cr = bmp->cr; --- 46,50 ---- st->FormatFunc(st->data, s); DrawThinFrame(bmp, x1, y1, x2, y2); ! rectfill(bmp, x1 + 1, y1 + 1, x2 - 1, y2 - 1, cgui_colors[CGUI_COLOR_STATUSFIELD_BACKGROUND]); cl = bmp->cl; cr = bmp->cr; *************** *** 52,56 **** cb = bmp->cb; set_clip_rect(bmp, x1 + 1, y1 + 1, x2 - 1, y2 - 1); ! textout_ex(bmp, b->font, s, x1 + xofs, ty, cgui_black, -1); set_clip_rect(bmp, cl, ct, cr, cb); } --- 52,56 ---- cb = bmp->cb; set_clip_rect(bmp, x1 + 1, y1 + 1, x2 - 1, y2 - 1); ! textout_ex(bmp, b->font, s, x1 + xofs, ty, cgui_colors[CGUI_COLOR_STATUSFIELD_TEXT], -1); set_clip_rect(bmp, cl, ct, cr, cb); } Index: obgroove.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/obgroove.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** obgroove.c 2 Mar 2003 17:45:17 -0000 1.1 --- obgroove.c 14 Jul 2008 20:20:44 -0000 1.1.4.1 *************** *** 14,20 **** if (b->parent->bmp == NULL) return; ! rectfill(b->parent->bmp, b->x1, b->y1, b->x2, b->y2, cgui_gray); ! hline(b->parent->bmp, b->x1 + 4, b->y1 + 1, b->x2 - 4, cgui_dgray); ! hline(b->parent->bmp, b->x1 + 4, b->y1 + 2, b->x2 - 4, cgui_lgray); } --- 14,20 ---- if (b->parent->bmp == NULL) return; ! rectfill(b->parent->bmp, b->x1, b->y1, b->x2, b->y2, cgui_colors[CGUI_COLOR_CONTAINER]); ! hline(b->parent->bmp, b->x1 + 4, b->y1 + 1, b->x2 - 4, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(b->parent->bmp, b->x1 + 4, b->y1 + 2, b->x2 - 4, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); } Index: list.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/list.c,v retrieving revision 1.1.2.6.2.22 retrieving revision 1.1.2.6.2.23 diff -C2 -d -r1.1.2.6.2.22 -r1.1.2.6.2.23 *** list.c 27 Apr 2008 10:54:23 -0000 1.1.2.6.2.22 --- list.c 14 Jul 2008 20:20:40 -0000 1.1.2.6.2.23 *************** *** 780,787 **** if (bmp == NULL) return; ! hline(bmp, b->x1, b->y1, b->x2, cgui_dgray); ! vline(bmp, b->x1, b->y1 + 1, b->y2, cgui_dgray); ! hline(bmp, b->x1 + 1, b->y2, b->x2, cgui_lgray); ! vline(bmp, b->x2, b->y1 + 1, b->y2 - 1, cgui_lgray); } --- 780,787 ---- if (bmp == NULL) return; ! hline(bmp, b->x1, b->y1, b->x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(bmp, b->x1, b->y1 + 1, b->y2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(bmp, b->x1 + 1, b->y2, b->x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! vline(bmp, b->x2, b->y1 + 1, b->y2 - 1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); } *************** *** 868,872 **** x1 = DrawNodeBranches(bmp, tree_node->parent, x1, y1, y2, w); if (!tree_node->last) ! vline(bmp, x1 + w/2, y1, y2, cgui_dgray); return x1 + w; } --- 868,872 ---- x1 = DrawNodeBranches(bmp, tree_node->parent, x1, y1, y2, w); if (!tree_node->last) ! vline(bmp, x1 + w/2, y1, y2, cgui_colors[CGUI_COLOR_TREE_CONTROL_OUTLINE]); return x1 + w; } *************** *** 890,904 **** x1 += w; if (tree_node->last) { ! vline(bmp, x, y1, y, cgui_dgray); } else { ! vline(bmp, x, y1, y2, cgui_dgray); } ! hline(bmp, x, y, x1-1, cgui_dgray); if (tree_node->internal) { ! rectfill(bmp, x-4, y-4, x+4, y+4, cgui_white); ! rect(bmp, x-5, y-5, x+5, y+5, cgui_dgray); ! hline(bmp, x-3, y, x+3, cgui_dgray); if (!tree_node->expanded) { ! vline(bmp, x, y-3, y+3, cgui_dgray); } } --- 890,904 ---- x1 += w; if (tree_node->last) { ! vline(bmp, x, y1, y, cgui_colors[CGUI_COLOR_TREE_CONTROL_OUTLINE]); } else { ! vline(bmp, x, y1, y2, cgui_colors[CGUI_COLOR_TREE_CONTROL_OUTLINE]); } ! hline(bmp, x, y, x1-1, cgui_colors[CGUI_COLOR_TREE_CONTROL_OUTLINE]); if (tree_node->internal) { ! rectfill(bmp, x-4, y-4, x+4, y+4, cgui_colors[CGUI_COLOR_TREE_CONTROL_BACKGROUND]); ! rect(bmp, x-5, y-5, x+5, y+5, cgui_colors[CGUI_COLOR_TREE_CONTROL_OUTLINE]); ! hline(bmp, x-3, y, x+3, cgui_colors[CGUI_COLOR_TREE_CONTROL_OUTLINE]); if (!tree_node->expanded) { ! vline(bmp, x, y-3, y+3, cgui_colors[CGUI_COLOR_TREE_CONTROL_OUTLINE]); } } *************** *** 939,942 **** --- 939,943 ---- t_image *im; void *appdata; + int red, green, blue; bmp = b->parent->bmp; *************** *** 954,966 **** if (b->hasfocus && cgui_list_show_focused_row) { if (b->hasfocus == 2) { ! bcolor = cgui_lblue; ! fcolor = cgui_black; } else { ! bcolor = cgui_blue; ! fcolor = cgui_white; } } else { ! fcolor = cgui_black; ! bcolor = cgui_white; } is_clipped = 0; --- 955,967 ---- if (b->hasfocus && cgui_list_show_focused_row) { if (b->hasfocus == 2) { ! bcolor = cgui_colors[CGUI_COLOR_LISTBOX_HIDDEN_FOCUS_BACKGROUND]; ! fcolor = cgui_colors[CGUI_COLOR_LISTBOX_HIDDEN_FOCUS_TEXT]; } else { ! bcolor = cgui_colors[CGUI_COLOR_LISTBOX_FOCUS_BACKGROUND]; ! fcolor = cgui_colors[CGUI_COLOR_LISTBOX_FOCUS_TEXT]; } } else { ! fcolor = cgui_colors[CGUI_COLOR_LISTBOX_TEXT]; ! bcolor = cgui_colors[CGUI_COLOR_LISTBOX_BACKGROUND]; } is_clipped = 0; *************** *** 990,994 **** } if (bgx > x1) ! rectfill(bmp, x1, y1, bgx-1, y2 - 1, cgui_white); rectfill(bmp, bgx, y1, x2, y2 - 1, CGUI_list_row_b_color); } --- 991,995 ---- } if (bgx > x1) ! rectfill(bmp, x1, y1, bgx-1, y2 - 1, cgui_colors[CGUI_COLOR_TREE_VIEW_BACKGROUND]); rectfill(bmp, bgx, y1, x2, y2 - 1, CGUI_list_row_b_color); } *************** *** 1005,1012 **** uline |= ret & ROW_UNDERLINE; strike |= ret & ROW_STRIKE; ! if (b->hasfocus == 1 && CGUI_list_row_b_color != cgui_blue) { /* selected row and app wants to have a different background */ ! CGUI_list_row_b_color = makecol(getr(CGUI_list_row_b_color) / 2, getg(CGUI_list_row_b_color)/2, (getb(CGUI_list_row_b_color) + 255)/2); ! CGUI_list_row_f_color = cgui_white; } if (l->column_widths) { --- 1006,1016 ---- uline |= ret & ROW_UNDERLINE; strike |= ret & ROW_STRIKE; ! if (b->hasfocus == 1 && CGUI_list_row_b_color != cgui_colors[CGUI_COLOR_LISTBOX_FOCUS_BACKGROUND]) { /* selected row and app wants to have a different background */ ! red = getr(CGUI_list_row_b_color) / 2; ! green = getg(CGUI_list_row_b_color)/2; ! blue = (getb(CGUI_list_row_b_color) + 255)/2; ! CGUI_list_row_b_color = makecol(red, green, blue); ! CGUI_list_row_f_color = makecol(255-red, 255-green, 255-blue); } if (l->column_widths) { *************** *** 1949,1953 **** DrawImage(im, bmp, x, 0); } else { ! textout_ex(bmp, l->font, s, x, 0, cgui_black, -1); } x += l->column_widths[i]; --- 1953,1957 ---- DrawImage(im, bmp, x, 0); } else { ! textout_ex(bmp, l->font, s, x, 0, cgui_colors[CGUI_COLOR_DRAGGED_TEXT], -1); } x += l->column_widths[i]; *************** *** 2430,2435 **** } CGUI_list_font = _cgui_prop_font; ! CGUI_list_row_delimiter_color = cgui_white; ! CGUI_list_column_delimiter_color = cgui_gray; } --- 2434,2439 ---- } CGUI_list_font = _cgui_prop_font; ! CGUI_list_row_delimiter_color = cgui_colors[CGUI_COLOR_LISTBOX_ROW_DELIMITER]; ! CGUI_list_column_delimiter_color = cgui_colors[CGUI_COLOR_LISTBOX_COLUMN_DELIMITER]; } Index: obprogr.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/obprogr.c,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** obprogr.c 5 Jul 2008 08:10:42 -0000 1.1.4.2 --- obprogr.c 14 Jul 2008 20:20:59 -0000 1.1.4.3 *************** *** 41,57 **** if (b->parent->bmp) { DrawThinFrame(b->parent->bmp, b->x1, b->y1, b->x2, b->y2); ! if (pb->x <= 0) ! rectfill(b->parent->bmp, b->x1 + FRAMEW, b->y1 + FRAMEW, ! b->x2 - FRAMEW, b->y2 - FRAMEW, cgui_gray); ! else { x = b->x1 + pb->x + FRAMEW; ! if (x >= b->x2 - FRAMEW) ! rectfill(b->parent->bmp, b->x1 + FRAMEW, b->y1 + FRAMEW, ! b->x2 - FRAMEW, b->y2 - FRAMEW, cgui_blue); ! else { ! rectfill(b->parent->bmp, b->x1 + FRAMEW, b->y1 + FRAMEW, ! x - 1, b->y2 - FRAMEW, cgui_blue); ! rectfill(b->parent->bmp, x, b->y1 + FRAMEW, ! b->x2 - FRAMEW, b->y2 - FRAMEW, cgui_gray); } } --- 41,53 ---- if (b->parent->bmp) { DrawThinFrame(b->parent->bmp, b->x1, b->y1, b->x2, b->y2); ! if (pb->x <= 0) { ! rectfill(b->parent->bmp, b->x1 + FRAMEW, b->y1 + FRAMEW, b->x2 - FRAMEW, b->y2 - FRAMEW, cgui_colors[CGUI_COLOR_PROGRESSBAR_BACKGROUND]); ! } else { x = b->x1 + pb->x + FRAMEW; ! if (x >= b->x2 - FRAMEW) { ! rectfill(b->parent->bmp, b->x1 + FRAMEW, b->y1 + FRAMEW, b->x2 - FRAMEW, b->y2 - FRAMEW, cgui_colors[CGUI_COLOR_PROGRESSBAR]); ! } else { ! rectfill(b->parent->bmp, b->x1 + FRAMEW, b->y1 + FRAMEW, x - 1, b->y2 - FRAMEW, cgui_colors[CGUI_COLOR_PROGRESSBAR]); ! rectfill(b->parent->bmp, x, b->y1 + FRAMEW, b->x2 - FRAMEW, b->y2 - FRAMEW, cgui_colors[CGUI_COLOR_PROGRESSBAR_BACKGROUND]); } } Index: menubar.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/menubar.c,v retrieving revision 1.1.2.1.2.2 retrieving revision 1.1.2.1.2.3 diff -C2 -d -r1.1.2.1.2.2 -r1.1.2.1.2.3 *** menubar.c 6 Sep 2007 18:57:24 -0000 1.1.2.1.2.2 --- menubar.c 14 Jul 2008 20:20:44 -0000 1.1.2.1.2.3 *************** *** 164,168 **** x2 = b->x2; y2 = b->y2; ! rectfill(bmp, b->x1, b->y1, b->x2, b->y2, cgui_gray); if (b->hasfocus) { MenuItemFrameIn(bmp, x1, y1, x2, y2); --- 164,168 ---- x2 = b->x2; y2 = b->y2; ! rectfill(bmp, b->x1, b->y1, b->x2, b->y2, cgui_colors[CGUI_COLOR_WIDGET_BACKGROUND]); if (b->hasfocus) { MenuItemFrameIn(bmp, x1, y1, x2, y2); *************** *** 229,242 **** x2 = b->x2; y2 = b->y2; ! rectfill(bmp, b->x1, b->y1, b->x2, b->y2, cgui_gray); if (b->inactive) ! col = cgui_lgray; else if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_lblue; else ! col = cgui_blue; } else ! col = cgui_black; if (b->hasfocus) { MenuItemFrameIn(bmp, x1, y1, x2, y2); --- 229,242 ---- x2 = b->x2; y2 = b->y2; ! rectfill(bmp, b->x1, b->y1, b->x2, b->y2, cgui_colors[CGUI_COLOR_WIDGET_BACKGROUND]); if (b->inactive) ! col = cgui_colors[CGUI_COLOR_LABEL_INACTIVE_1]; else if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_colors[CGUI_COLOR_LABEL_HIDDEN_FOCUS]; else ! col = cgui_colors[CGUI_COLOR_LABEL_FOCUS]; } else ! col = cgui_colors[CGUI_COLOR_LABEL]; if (b->hasfocus) { MenuItemFrameIn(bmp, x1, y1, x2, y2); Index: obcheck.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/obcheck.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** obcheck.c 2 Mar 2003 17:45:17 -0000 1.1 --- obcheck.c 14 Jul 2008 20:20:44 -0000 1.1.4.1 *************** *** 38,44 **** bmp = b->parent->bmp; if (b->inactive) ! col = cgui_lgray; else ! col = cgui_black; if (y > b->y2 - 3 - 8) y = b->y2 - 3 - 8; --- 38,44 ---- bmp = b->parent->bmp; if (b->inactive) ! col = cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]; else ! col = cgui_colors[CGUI_COLOR_LABEL]; if (y > b->y2 - 3 - 8) y = b->y2 - 3 - 8; *************** *** 59,65 **** y1 = b->y1; y2 = b->y2; ! rect(bmp, x1 + 1, y1 + 1, x2 - 2, y2 - 1, cgui_gray); ! rect(bmp, x1 + 2, y1 + 2, x2 - 2, y2 - 2, cgui_gray); ! rectfill(bmp, x1 + 4, y1 + 4, x2 - 4, y2 - 4, cgui_white); DrawThinFrame(bmp, x1+3, y1+3, x2 - 3, y2 - 3); } --- 59,65 ---- y1 = b->y1; y2 = b->y2; ! rect(bmp, x1 + 1, y1 + 1, x2 - 2, y2 - 1, cgui_colors[CGUI_COLOR_WIDGET_BACKGROUND]); ! rect(bmp, x1 + 2, y1 + 2, x2 - 2, y2 - 2, cgui_colors[CGUI_COLOR_WIDGET_BACKGROUND]); ! rectfill(bmp, x1 + 4, y1 + 4, x2 - 4, y2 - 4, cgui_colors[CGUI_COLOR_CHECKBOX_MARK_BACKGROUND]); DrawThinFrame(bmp, x1+3, y1+3, x2 - 3, y2 - 3); } *************** *** 81,85 **** } DrawCheckMarkBox(b); /* always do to rub */ ! rect(b->parent->bmp, b->x1, b->y1, b->x2, b->y2, cgui_dgray); if (*ch->sel) DrawCheckMark(b, b->x1 + 5, TEXTY(b, 2)); --- 81,85 ---- } DrawCheckMarkBox(b); /* always do to rub */ ! rect(b->parent->bmp, b->x1, b->y1, b->x2, b->y2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); if (*ch->sel) DrawCheckMark(b, b->x1 + 5, TEXTY(b, 2)); Index: obedbox.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/obedbox.c,v retrieving revision 1.1.2.1.2.24 retrieving revision 1.1.2.1.2.25 diff -C2 -d -r1.1.2.1.2.24 -r1.1.2.1.2.25 *** obedbox.c 25 Apr 2008 21:05:47 -0000 1.1.2.1.2.24 --- obedbox.c 14 Jul 2008 20:20:44 -0000 1.1.2.1.2.25 *************** *** 1276,1290 **** yt = TEXTY(b, 0); if (b->inactive) ! col = cgui_lgray; else if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_lblue; else ! col = cgui_blue; } else ! col = cgui_black; if (bmp) { ! rectfill(bmp, x1, y1, x2, y2, cgui_gray); x1 += offset; if (b->im) { --- 1276,1290 ---- yt = TEXTY(b, 0); if (b->inactive) ! col = cgui_colors[CGUI_COLOR_LABEL_INACTIVE_1]; else if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_colors[CGUI_COLOR_LABEL_HIDDEN_FOCUS]; else ! col = cgui_colors[CGUI_COLOR_LABEL_FOCUS]; } else ! col = cgui_colors[CGUI_COLOR_LABEL]; if (bmp) { ! rectfill(bmp, x1, y1, x2, y2, cgui_colors[CGUI_COLOR_WIDGET_BACKGROUND]); x1 += offset; if (b->im) { *************** *** 1300,1304 **** } if (b->inactive) { ! textout_ex(bmp, b->font, b->label, x1 + 1, yt + offset + 1, cgui_dgray, -1); } textout_ex(bmp, b->font, b->label, x1, yt + offset, col, -1); --- 1300,1304 ---- } if (b->inactive) { ! textout_ex(bmp, b->font, b->label, x1 + 1, yt + offset + 1, cgui_colors[CGUI_COLOR_LABEL_INACTIVE_2], -1); } textout_ex(bmp, b->font, b->label, x1, yt + offset, col, -1); *************** *** 1327,1348 **** DrawLeftSidedImage(b, b->x1, x1, 0); ! hline(nd->bmp, x1, y1, x2, cgui_dgray); ! hline(nd->bmp, x1 + 1, y1 + 1, x2 - 1, cgui_dgray); ! vline(nd->bmp, x1, y1 + 1, y2, cgui_dgray); ! vline(nd->bmp, x1 + 1, y1 + 2, y2 - 1, cgui_dgray); ! hline(nd->bmp, x1 + 1, y2, x2, cgui_lgray); ! hline(nd->bmp, x1 + 2, y2 - 1, x2, cgui_lgray); ! vline(nd->bmp, x2, y1 + 1, y2 - 2, cgui_lgray); ! vline(nd->bmp, x2 - 1, y1 + 2, y2 - 2, cgui_lgray); if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_lblue; else ! col = cgui_blue; } else ! col = cgui_white; rect(nd->bmp, x1 + 2, y1 + 2, x2 - 2, y2 - 2, col); } --- 1327,1348 ---- DrawLeftSidedImage(b, b->x1, x1, 0); ! hline(nd->bmp, x1, y1, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(nd->bmp, x1 + 1, y1 + 1, x2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(nd->bmp, x1, y1 + 1, y2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! vline(nd->bmp, x1 + 1, y1 + 2, y2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(nd->bmp, x1 + 1, y2, x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! hline(nd->bmp, x1 + 2, y2 - 1, x2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! vline(nd->bmp, x2, y1 + 1, y2 - 2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! vline(nd->bmp, x2 - 1, y1 + 2, y2 - 2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); if (b->hasfocus) { if (b->hasfocus == 2) ! col = cgui_colors[CGUI_COLOR_LABEL_HIDDEN_FOCUS]; else ! col = cgui_colors[CGUI_COLOR_BUTTON_FRAME_FOCUS]; } else ! col = cgui_colors[CGUI_COLOR_EDITBOX_BACKGROUND]; rect(nd->bmp, x1 + 2, y1 + 2, x2 - 2, y2 - 2, col); } *************** *** 1360,1368 **** return; if (b->inactive) { ! drawcol = cgui_dgray; ! bcol = cgui_lgray; } else { ! drawcol = cgui_black; ! bcol = cgui_white; } if (!edb->edit_in_progress) --- 1360,1368 ---- return; if (b->inactive) { ! drawcol = cgui_colors[CGUI_COLOR_EDITBOX_TEXT_INACTIVE]; ! bcol = cgui_colors[CGUI_COLOR_EDITBOX_BACKGROUND_INACTIVE]; } else { ! drawcol = cgui_colors[CGUI_COLOR_EDITBOX_TEXT]; ! bcol = cgui_colors[CGUI_COLOR_EDITBOX_BACKGROUND]; } if (!edb->edit_in_progress) *************** *** 1398,1402 **** select_startx = 1 + l1; select_endx = l1 + l2; ! rectfill(edb->bmp, select_startx, 0, select_endx, y2, cgui_blue); } } --- 1398,1402 ---- select_startx = 1 + l1; select_endx = l1 + l2; ! rectfill(edb->bmp, select_startx, 0, select_endx, y2, cgui_colors[CGUI_COLOR_EDITBOX_BACKGROUND_MARK]); } } *************** *** 1405,1409 **** if (edb->cursor) { if (edb->x >= select_startx && edb->x <= select_endx ) { ! curs_col = cgui_white; } else { curs_col = drawcol; --- 1405,1409 ---- if (edb->cursor) { if (edb->x >= select_startx && edb->x <= select_endx ) { ! curs_col = cgui_colors[CGUI_COLOR_EDITBOX_TEXT_MARK]; } else { curs_col = drawcol; Index: ndresize.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/ndresize.c,v retrieving revision 1.1.4.2 retrieving revision 1.1.4.3 diff -C2 -d -r1.1.4.2 -r1.1.4.3 *** ndresize.c 25 Apr 2008 21:05:47 -0000 1.1.4.2 --- ndresize.c 14 Jul 2008 20:20:44 -0000 1.1.4.3 *************** *** 164,172 **** if (y2>b->y2) y2 = b->y2; ! rectfill(b->parent->bmp, b->x1, b->y1, b->x2, b->y2, cgui_gray); for (i=y1; i<y2; i+=2) ! putpixel(b->parent->bmp, b->x1, i, cgui_dgray); for (i=y1+1; i<=y2; i+=2) ! putpixel(b->parent->bmp, b->x2, i, cgui_dgray); } } --- 164,172 ---- if (y2>b->y2) y2 = b->y2; ! rectfill(b->parent->bmp, b->x1, b->y1, b->x2, b->y2, cgui_colors[CGUI_COLOR_CONTAINER]); for (i=y1; i<y2; i+=2) ! putpixel(b->parent->bmp, b->x1, i, cgui_colors[CGUI_COLOR_RESIZER_HANDLE]); for (i=y1+1; i<=y2; i+=2) ! putpixel(b->parent->bmp, b->x2, i, cgui_colors[CGUI_COLOR_RESIZER_HANDLE]); } } *************** *** 182,190 **** if (x2>b->x2) x2 = b->x2; ! rectfill(b->parent->bmp, b->x1, b->y1, b->x2, b->y2, cgui_gray); for (i=x1; i<x2; i+=2) ! putpixel(b->parent->bmp, i, b->y1, cgui_dgray); for (i=x1+1; i<=x2; i+=2) ! putpixel(b->parent->bmp, i, b->y2, cgui_dgray); } } --- 182,190 ---- if (x2>b->x2) x2 = b->x2; ! rectfill(b->parent->bmp, b->x1, b->y1, b->x2, b->y2, cgui_colors[CGUI_COLOR_CONTAINER]); for (i=x1; i<x2; i+=2) ! putpixel(b->parent->bmp, i, b->y1, cgui_colors[CGUI_COLOR_RESIZER_HANDLE]); for (i=x1+1; i<=x2; i+=2) ! putpixel(b->parent->bmp, i, b->y2, cgui_colors[CGUI_COLOR_RESIZER_HANDLE]); } } *************** *** 194,202 **** int i; if (b->parent->bmp) { ! rectfill(b->parent->bmp, b->x1, b->y1, b->x2, b->y2, cgui_gray); for (i=b->x1; i<b->x2-1; i+=2) { ! putpixel(b->parent->bmp, i, b->y1, cgui_dgray); ! putpixel(b->parent->bmp, i+1, b->y1+1, cgui_dgray); ! putpixel(b->parent->bmp, i, b->y1+2, cgui_dgray); } } --- 194,202 ---- int i; if (b->parent->bmp) { ! rectfill(b->parent->bmp, b->x1, b->y1, b->x2, b->y2, cgui_colors[CGUI_COLOR_CONTAINER]); for (i=b->x1; i<b->x2-1; i+=2) { ! putpixel(b->parent->bmp, i, b->y1, cgui_colors[CGUI_COLOR_RESIZER_HANDLE]); ! putpixel(b->parent->bmp, i+1, b->y1+1, cgui_colors[CGUI_COLOR_RESIZER_HANDLE]); ! putpixel(b->parent->bmp, i, b->y1+2, cgui_colors[CGUI_COLOR_RESIZER_HANDLE]); } } Index: tabwin.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/tabwin.c,v retrieving revision 1.1.2.1.2.2 retrieving revision 1.1.2.1.2.3 diff -C2 -d -r1.1.2.1.2.2 -r1.1.2.1.2.3 *** tabwin.c 25 Sep 2005 17:10:54 -0000 1.1.2.1.2.2 --- tabwin.c 14 Jul 2008 20:20:59 -0000 1.1.2.1.2.3 *************** *** 27,35 **** x2 = b->x2; y2 = b->y2; ! rectfill(nd->bmp, x1, y1, x2, y2 - 4, cgui_gray); ! hline(nd->bmp, x1, y2 - 3, x2 - 1, cgui_lgray); ! putpixel(nd->bmp, x2, y2 - 1, cgui_dgray); ! hline(nd->bmp, x1, y2 - 2, x2 - 2, cgui_lgray); ! hline(nd->bmp, x2 - 1, y2 - 2, x2, cgui_dgray); } --- 27,35 ---- x2 = b->x2; y2 = b->y2; ! rectfill(nd->bmp, x1, y1, x2, y2 - 4, cgui_colors[CGUI_COLOR_CONTAINER]); ! hline(nd->bmp, x1, y2 - 3, x2 - 1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! putpixel(nd->bmp, x2, y2 - 1, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(nd->bmp, x1, y2 - 2, x2 - 2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! hline(nd->bmp, x2 - 1, y2 - 2, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); } *************** *** 47,60 **** x2 = b->x2 - b->x1; y2 = b->y2 - b->y1; ! rectfill(nd->bmp, x, y1, x + 1, y2 - 1, cgui_lgray); ! rectfill(nd->bmp, x2 - 1, y1, x2, y2 - 2, cgui_dgray); ! hline(nd->bmp, x + 1, y2 - 1, x2, cgui_dgray); ! hline(nd->bmp, x, y2, x2, cgui_dgray); ! rectfill(nd->bmp, x, y + 2, x + 1, y1 - 1, cgui_gray); ! rectfill(nd->bmp, x2 - 1, y + 2, x2, y1 - 1, cgui_gray); ! rectfill(nd->bmp, x, y, x2, y + 1, cgui_gray); ! rectfill(nd->bmp, x + 2, y1, x2 - 2, y1 + 1, cgui_gray); ! putpixel(nd->bmp, x + 1, y1 - 1, cgui_lgray); ! putpixel(nd->bmp, x2 - 1, y1 - 1, cgui_lgray); } --- 47,60 ---- x2 = b->x2 - b->x1; y2 = b->y2 - b->y1; ! rectfill(nd->bmp, x, y1, x + 1, y2 - 1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! rectfill(nd->bmp, x2 - 1, y1, x2, y2 - 2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(nd->bmp, x + 1, y2 - 1, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! hline(nd->bmp, x, y2, x2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); ! rectfill(nd->bmp, x, y + 2, x + 1, y1 - 1, cgui_colors[CGUI_COLOR_CONTAINER]); ! rectfill(nd->bmp, x2 - 1, y + 2, x2, y1 - 1, cgui_colors[CGUI_COLOR_CONTAINER]); ! rectfill(nd->bmp, x, y, x2, y + 1, cgui_colors[CGUI_COLOR_CONTAINER]); ! rectfill(nd->bmp, x + 2, y1, x2 - 2, y1 + 1, cgui_colors[CGUI_COLOR_CONTAINER]); ! putpixel(nd->bmp, x + 1, y1 - 1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! putpixel(nd->bmp, x2 - 1, y1 - 1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); } Index: filebrow.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/filebrow.c,v retrieving revision 1.2.2.4.2.17 retrieving revision 1.2.2.4.2.18 diff -C2 -d -r1.2.2.4.2.17 -r1.2.2.4.2.18 *** filebrow.c 11 Jun 2008 18:52:13 -0000 1.2.2.4.2.17 --- filebrow.c 14 Jul 2008 20:20:39 -0000 1.2.2.4.2.18 *************** *** 1,2201 **** ! /* Module FILEBROW.C ! Contains the gui-part of the file browser. There are two api-functions, ! one for selecting file(s) and another for file-maninging. Both ! wraps a generic file-browser. ! */ ! #include <ctype.h> ! #include <string.h> ! #include <allegro.h> ! ! #include "filebrow.h" [...4373 lines suppressed...] ! { ! DATAFILE *df; ! ! df = load_datafile_object(filename, objname+6); ! if (df) { ! RegisterImageCopy(df->dat, objname+1, IMAGE_TRANS_BMP, 0); ! unload_datafile_object(df); ! } ! } ! ! extern void CguiUseIcons(const char *filename) ! { ! LoadASingleIcon(filename, icon_name_mkdatadir); ! LoadASingleIcon(filename, icon_name_datadir); ! LoadASingleIcon(filename, icon_name_mkdir); ! LoadASingleIcon(filename, icon_name_up); ! LoadASingleIcon(filename, icon_name_uparrow); ! LoadASingleIcon(filename, icon_name_dir); ! LoadASingleIcon(filename, icon_name_drive); ! } Index: statelog.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/statelog.c,v retrieving revision 1.1.4.1 retrieving revision 1.1.4.2 diff -C2 -d -r1.1.4.1 -r1.1.4.2 *** statelog.c 25 Sep 2005 17:10:54 -0000 1.1.4.1 --- statelog.c 14 Jul 2008 20:20:59 -0000 1.1.4.2 *************** *** 165,170 **** else sprintf(buf, "%d", x); ! rectfill(screen, 400, y, 800, y+9, cgui_white); ! textout_ex(screen, font, buf, 400, y, cgui_black, -1); y+=9; rest(2000); --- 165,170 ---- else sprintf(buf, "%d", x); ! rectfill(screen, 400, y, 800, y+9, makecol(255, 255, 255)); ! textout_ex(screen, font, buf, 400, y, makecol(0,0,0), -1); y+=9; rest(2000); Index: tabs.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/tabs.c,v retrieving revision 1.1.4.4 retrieving revision 1.1.4.5 diff -C2 -d -r1.1.4.4 -r1.1.4.5 *** tabs.c 8 Nov 2005 08:30:45 -0000 1.1.4.4 --- tabs.c 14 Jul 2008 20:20:59 -0000 1.1.4.5 *************** *** 17,21 **** #include "tabs.h" - static void DrawTab(t_object *b) { --- 17,20 ---- *************** *** 35,61 **** y1++; /* ----- upper frame top 2 pixellines */ ! hline(nd->bmp, x1 + 2, y1, x2 - 2, cgui_lgray); ! hline(nd->bmp, x1 + 1, y1 + 1, x2 - 1, cgui_lgray); /* left pixelcolumns */ ! rectfill(nd->bmp, x1, y1 + 2, x1 + 1, y2, cgui_lgray); /* right pixelcolumns */ ! rectfill(nd->bmp, x2 - 1, y1 + 2, x2, y2, cgui_dgray); /* the corners: upper left */ ! hline(nd->bmp, x1, y1, x1 + 1, cgui_gray); ! putpixel(nd->bmp, x1, y1 + 1, cgui_gray); /* upper right */ ! hline(nd->bmp, x2 - 1, y1, x2, cgui_gray); ! putpixel(nd->bmp, x2, y1 + 1, cgui_gray); ! /* ----- text background */ ! if (t->selected) /* selected tab */ ! rectfill(nd->bmp, x1 + 2, y1 + 2, x2 - 2, y2, cgui_gray); ! else { /* unselected tab */ ! hline(nd->bmp, x1, y1 - 1, x2, cgui_gray); ! rectfill(nd->bmp, x1 + 2, y1 + 2, x2 - 2, y2 - 2, cgui_gray); ! rectfill(nd->bmp, x1, y2 - 1, x2, y2, cgui_lgray); /* case unselected: ! top-frame of ! window "hides" */ } --- 34,60 ---- y1++; /* ----- upper frame top 2 pixellines */ ! hline(nd->bmp, x1 + 2, y1, x2 - 2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); ! hline(nd->bmp, x1 + 1, y1 + 1, x2 - 1, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); /* left pixelcolumns */ ! rectfill(nd->bmp, x1, y1 + 2, x1 + 1, y2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); /* right pixelcolumns */ ! rectfill(nd->bmp, x2 - 1, y1 + 2, x2, y2, cgui_colors[CGUI_COLOR_SHADOWED_BORDER]); /* the corners: upper left */ ! hline(nd->bmp, x1, y1, x1 + 1, cgui_colors[CGUI_COLOR_CONTAINER]); ! putpixel(nd->bmp, x1, y1 + 1, cgui_colors[CGUI_COLOR_CONTAINER]); /* upper right */ ! hline(nd->bmp, x2 - 1, y1, x2, cgui_colors[CGUI_COLOR_CONTAINER]); ! putpixel(nd->bmp, x2, y1 + 1, cgui_colors[CGUI_COLOR_CONTAINER]); ! /* Tab background */ ! if (t->selected) { ! /* Join the selected tab with the client are by hiding the top frame part of the client area's border. */ ! rectfill(nd->bmp, x1 + 2, y1 + 2, x2 - 2, y2, cgui_colors[CGUI_COLOR_SELECTED_TAB]); ! } else { ! /* Unselected tab */ ! hline(nd->bmp, x1, y1 - 1, x2, cgui_colors[CGUI_COLOR_CONTAINER]); ! rectfill(nd->bmp, x1 + 2, y1 + 2, x2 - 2, y2 - 2, cgui_colors[CGUI_COLOR_UNSELECTED_TAB]); ! rectfill(nd->bmp, x1, y2 - 1, x2, y2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); } Index: tabruler.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/tabruler.c,v retrieving revision 1.1 retrieving revision 1.1.4.1 diff -C2 -d -r1.1 -r1.1.4.1 *** tabruler.c 2 Mar 2003 17:45:17 -0000 1.1 --- tabruler.c 14 Jul 2008 20:20:59 -0000 1.1.4.1 *************** *** 38,49 **** tr = b->appdata; bmp = b->parent->bmp; ! rectfill(bmp, b->x1, b->y1, b->x2, b->y2, cgui_white); if (tr->options & TR_SHOWPOS) for (x=b->x1; x<b->x2; x+=tr->dx) ! vline(bmp, x, b->y1, b->y2, cgui_lgray); for (i=0; i<tr->n; i++) { x = b->x1 + tr->tablist[i]; ! hline(bmp, x, b->y1+1, x+tr->dx-1, cgui_black); ! vline(bmp, x, b->y1+2, b->y2, cgui_black); } } --- 38,49 ---- tr = b->appdata; bmp = b->parent->bmp; ! rectfill(bmp, b->x1, b->y1, b->x2, b->y2, cgui_colors[CGUI_COLOR_HEAVY_LIGHTENED_BORDER]); if (tr->options & TR_SHOWPOS) for (x=b->x1; x<b->x2; x+=tr->dx) ! vline(bmp, x, b->y1, b->y2, cgui_colors[CGUI_COLOR_LIGHTENED_BORDER]); for (i=0; i<tr->n; i++) { x = b->x1 + tr->tablist[i]; ! hline(bmp, x, b->y1+1, x+tr->dx-1, cgui_colors[CGUI_COLOR_HEAVY_SHADOWED_BORDER]); ! vline(bmp, x, b->y1+2, b->y2, cgui_colors[CGUI_COLOR_HEAVY_SHADOWED_BORDER]); } } Index: menuitem.c =================================================================== RCS file: /cvsroot/cgui/cgui/src/Attic/menuitem.c,v retrieving revision 1.1.4.5 retrieving revision 1.1.4.6 diff -C2 -d -r1.1.4.5 -r1.1.4.6 *** menuitem.c 28 Sep 2007 22:17:00 -0000 1.1.4.5 --- menuitem.c 14 Jul 2008 20:20:44 -0000 1.1.4.6 **************... [truncated message content] |