diff options
| author | Matt Ebb <matt@mke3.net> | 2003-10-21 11:02:04 +0400 |
|---|---|---|
| committer | Matt Ebb <matt@mke3.net> | 2003-10-21 11:02:04 +0400 |
| commit | 4405113308ee8165d2327dd58c6d0cd845678cc1 (patch) | |
| tree | e1a4ab25f040fc987d97bb4fbbd2ade98037ac26 /source/blender/src/resources.c | |
| parent | ff89daceb0fda2b0557e94a088f9a0973f2d704a (diff) | |
- Lots of tweaks to interface colours, shading, etc.
- Fixed alignment/width of menus
Still needs more work.
Diffstat (limited to 'source/blender/src/resources.c')
| -rw-r--r-- | source/blender/src/resources.c | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index 1555dd9bc56..3795d502c83 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -436,7 +436,7 @@ void BIF_InitTheme(void) SETCOL(btheme->tui.setting2, 0xA2,0x98,0xA9, 255); SETCOL(btheme->tui.num, 0x90,0x90,0x90, 255); SETCOL(btheme->tui.textfield, 0x90,0x90,0x90, 255); - SETCOL(btheme->tui.popup, 0xB2,0xB2,0xA9, 255); + SETCOL(btheme->tui.popup, 0xA0,0xA0,0xA0, 255); SETCOL(btheme->tui.text, 0,0,0, 255); SETCOL(btheme->tui.text_hi, 255, 255, 255, 255); @@ -632,7 +632,24 @@ void BIF_ThemeColorShade(int colorid, int offset) CLAMP(g, 0, 255); b= offset + (int) cp[2]; CLAMP(b, 0, 255); - glColor3ub(r, g, b); + //glColor3ub(r, g, b); + glColor4ub(r, g, b, cp[3]); +} +void BIF_ThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset) +{ + int r, g, b, a; + char *cp; + + cp= BIF_ThemeGetColorPtr(theme_active, theme_spacetype, colorid); + r= coloffset + (int) cp[0]; + CLAMP(r, 0, 255); + g= coloffset + (int) cp[1]; + CLAMP(g, 0, 255); + b= coloffset + (int) cp[2]; + CLAMP(b, 0, 255); + a= alphaoffset + (int) cp[3]; + CLAMP(a, 0, 255); + glColor4ub(r, g, b, a); } // blend between to theme colors, and set it |