diff options
| author | Ton Roosendaal <ton@blender.org> | 2003-10-08 02:55:16 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2003-10-08 02:55:16 +0400 |
| commit | 416b110f90825c1775151b58dd18b9c7835db492 (patch) | |
| tree | 5c1bb15ea0571ecddb7fa5192f6fd4280d4affd3 /source/blender/src/resources.c | |
| parent | bfef0c2fb579ff53d7b2d0abce8a86ae91d05acc (diff) | |
- brought back hilites in buttons when mouse-over
- automatic pulldown opening can now be controlled ( user setting?)
it has two thresholds:
- when no menu was opened before, it waits A milliseconds
- when (in the same block a menu was opened, it waits B millisec.
Currently A= 0.4 sec, B= 0.1 (or so)
- 3d window header; brought back old drawtype menu (test, compare!)
- another test: the old menubutton doesnt work anymore with hold-mouse
only, you can also use it as the other popups (old method still works)
- proposal; all buttons that pop up a block, get special drawtype (arrows)
Diffstat (limited to 'source/blender/src/resources.c')
| -rw-r--r-- | source/blender/src/resources.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index 966abee3814..0da608bf544 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -124,7 +124,8 @@ static unsigned char *get_color(BIFColorID colorid, BIFColorShade shade) { int coloridx= colorid-BIFCOLORID_FIRST; int shadeidx= shade-BIFCOLORSHADE_FIRST; - if (coloridx>=0 && coloridx<BIFNCOLORIDS && shadeidx>=0&& shadeidx<BIFNCOLORSHADES) { + + if (coloridx>=0 && coloridx<BIFNCOLORIDS && shadeidx>=0 && shadeidx<BIFNCOLORSHADES) { return common_colors_arr[coloridx].cols[shadeidx]; } else { static unsigned char errorcol[3]= {0xFF, 0x33, 0x33}; @@ -143,6 +144,7 @@ static void rgbaCCol_addNT(unsigned char *t, unsigned char *a, int N) t[0]= colclamp(a[0]+N); t[1]= colclamp(a[1]+N); t[2]= colclamp(a[2]+N); + } static void def_col(BIFColorID colorid, unsigned char r, unsigned char g, unsigned char b) { @@ -151,9 +153,9 @@ static void def_col(BIFColorID colorid, unsigned char r, unsigned char g, unsign unsigned char col[3]; col[0]= r, col[1]= g, col[2]= b; - rgbaCCol_addNT(get_color(colorid, COLORSHADE_WHITE), col, 60); - rgbaCCol_addNT(get_color(colorid, COLORSHADE_LIGHT), col, 35); - rgbaCCol_addNT(get_color(colorid, COLORSHADE_HILITE), col, 20); + rgbaCCol_addNT(get_color(colorid, COLORSHADE_WHITE), col, 70); + rgbaCCol_addNT(get_color(colorid, COLORSHADE_LIGHT), col, 45); + rgbaCCol_addNT(get_color(colorid, COLORSHADE_HILITE), col, 25); rgbaCCol_addNT(get_color(colorid, COLORSHADE_LMEDIUM), col, 10); rgbaCCol_addNT(get_color(colorid, COLORSHADE_MEDIUM), col, 0); rgbaCCol_addNT(get_color(colorid, COLORSHADE_LGREY), col, -20); |