From 090eb71a2615fa2d259b3489385a61bd6657950f Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 1 Jun 2005 20:05:49 +0000 Subject: OK, I admit that I am nuts. But since the code was mostly there anyways adding only a few bytes to the library in total, I added the symbols 'refresh' (formerly known as 'recycle'), 'reload', 'undo', and 'redo', and flags to flip symbols horizontaly '$', and verticaly '%'. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4391 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_symbols.cxx | 69 +++++++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 55 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/fl_symbols.cxx b/src/fl_symbols.cxx index 02f3fe2ed..bec2a8196 100644 --- a/src/fl_symbols.cxx +++ b/src/fl_symbols.cxx @@ -113,6 +113,15 @@ int fl_draw_symbol(const char *label,int x,int y,int w,int h,Fl_Color col) { if (w < 10) {x -= (10-w)/2; w = 10;} if (h < 10) {y -= (10-h)/2; h = 10;} w = (w-1)|1; h = (h-1)|1; + char flip_x = 0, flip_y = 0; + if (*p=='$') { + flip_x = 1; + p++; + } + if (*p=='%') { + flip_y = 1; + p++; + } int rotangle; switch (*p++) { case '0': @@ -142,6 +151,8 @@ int fl_draw_symbol(const char *label,int x,int y,int w,int h,Fl_Color col) { if (equalscale) {if (w=0.0; i-=di, r-=dr1) { - double a = i/180.0 * M_PI; - vv(cos(a)*r, sin(a)*r); + for (i=27, a=140.0, r=1.0; i>0; i--, a-=da, r-=dr1) { + double ar = a/180.0 * M_PI; + vv(cos(ar)*r, sin(ar)*r); } - for (i=0.0; i<=135.0; i+=di, r-=dr2) { - double a = i/180.0 * M_PI; - vv(cos(a)*r, sin(a)*r); + for (i=27; i>=0; a+=da, i--, r-=dr2) { + double ar = a/180.0 * M_PI; + vv(cos(ar)*r, sin(ar)*r); } - if (j&2) { + if (j&1) { EC; } else { ECP; @@ -608,6 +618,33 @@ static void draw_recycle(Fl_Color c) { } } +static void draw_refresh(Fl_Color c) { + draw_round_arrow(c); + fl_rotate(180.0); + draw_round_arrow(c); + fl_rotate(-180.0); +} + +static void draw_reload(Fl_Color c) { + fl_rotate(-135.0); + draw_round_arrow(c, 10); + fl_rotate(135.0); +} + +static void draw_undo(Fl_Color c) { + fl_translate(0.0, 0.2); + fl_scale(1.0, -1.0); + draw_round_arrow(c, 6); + fl_scale(1.0, -1.0); + fl_translate(0.0, -0.2); +} + +static void draw_redo(Fl_Color c) { + fl_scale(-1.0, 1.0); + draw_undo(c); + fl_scale(-1.0, 1.0); +} + static void fl_init_symbols(void) { static char beenhere; if (beenhere) return; @@ -649,7 +686,11 @@ static void fl_init_symbols(void) { fl_add_symbol("filesave", draw_filesave, 1); fl_add_symbol("filesaveas", draw_filesaveas, 1); fl_add_symbol("fileprint", draw_fileprint, 1); - fl_add_symbol("recycle", draw_recycle, 1); + + fl_add_symbol("refresh", draw_refresh, 1); + fl_add_symbol("reload", draw_reload, 1); + fl_add_symbol("undo", draw_undo, 1); + fl_add_symbol("redo", draw_redo, 1); // fl_add_symbol("file", draw_file, 1); } -- cgit v1.2.3