diff options
author | Ton Roosendaal <ton@blender.org> | 2003-10-20 19:40:20 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2003-10-20 19:40:20 +0400 |
commit | 7f5d06d638ff24444da942cf91c130d5393818cb (patch) | |
tree | 2b21f227adfb1d7f2004087e60b05c3af230d5ee /source/blender/src/language.c | |
parent | 628b0025836183436ab5b83120497ebe060f89b7 (diff) |
Another mega commit... loadsof restructure, and a pretty good one! :)
- changed the BIF_DrawString() function. it used to work different for
AA fonts as for default fonts. Now it's identical. Setting color for fonts
can just be done with OpenGL, for both font types.
Removed: BIF_DrawStringRGB()
- added theme color options for Buttons
- recoded DefButton, so it automatically chooses the right color.
- had to remove a 1000 uiBlockSetCol() calls for that reason...
- uiBlockSetCol() still works, to override automatic color
- removed entirely the silly old color system (BIFColorID). All color
calls can now be done with a BIF_ThemeColor() call, including fonts and
buttons and opengl stuff
- all buttons in button header have headercolor by default
- recoded drawing icons, it was a really bad & old loop doing manually
colorshading and blending... which was per pixel a load of code!
Now it uses a single OpenGL call to blend or colorize. Quite faster!
- (as test, for review) icons don't colorize anymore with button color,
but have a different alpha to blend in (when not active)
- recoded the entire interface_draw.c file...:
- drawing buttons is separated in three parts:
1. main drawing function for text and icons
2. free definable callback for button itself
3. free definable callback for slider
- removed a load of redundant code for this!
- coded a minimal theme, and adjusted Matt's buttons to match new
callback system
- adding new drawing themes is piece of cake now
- for coders, default 'themes' to be aware of:
UI_EMBOSS : the themable drawing style
UI_EMBOSSP: the pulldown menu system (apart from color not themable)
UI_EMBOSSN: draw nothing, only text and/or icon
UI_EMBOSSM: minimal theme, still in use for Logic and Constraintsa
this can be set with uiBlockSetEmboss(block) or in the uiNewBlock() call.
TODO: make UI API call for button alignment
(plus removed another series of warnings from code...)
Plus: fixed bug in Matts commit: he used a 'short' button for an 'int'
Diffstat (limited to 'source/blender/src/language.c')
-rw-r--r-- | source/blender/src/language.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/source/blender/src/language.c b/source/blender/src/language.c index cdfc9c9b218..a8918c3862f 100644 --- a/source/blender/src/language.c +++ b/source/blender/src/language.c @@ -67,32 +67,16 @@ static LANGMenuEntry *langmenu= 0; static int tot_lang = 0; #endif // INTERNATIONAL -int BIF_DrawString(BMF_Font* font, char *str, int translate, int col) -{ - -#ifdef INTERNATIONAL - if(G.ui_international == TRUE) - if(translate) - return FTF_DrawString(str, FTF_USE_GETTEXT | FTF_INPUT_UTF8, col); - else - return FTF_DrawString(str, FTF_NO_TRANSCONV | FTF_INPUT_UTF8, col); - else - return BMF_DrawString(font, str); -#else - return BMF_DrawString(font, str); -#endif - -} -int BIF_DrawStringRGB(BMF_Font* font, char *str, int translate, float r, float g, float b) +int BIF_DrawString(BMF_Font* font, char *str, int translate) { #ifdef INTERNATIONAL if(G.ui_international == TRUE) if(translate) - return FTF_DrawStringRGB(str, FTF_USE_GETTEXT | FTF_INPUT_UTF8, r, g, b); + return FTF_DrawString(str, FTF_USE_GETTEXT | FTF_INPUT_UTF8); else - return FTF_DrawStringRGB(str, FTF_NO_TRANSCONV | FTF_INPUT_UTF8, r, g, b); + return FTF_DrawString(str, FTF_NO_TRANSCONV | FTF_INPUT_UTF8); else return BMF_DrawString(font, str); #else |