Blender Git Loki

Git Commits -> Revision 7f5d06d

Revision 7f5d06d by Ton Roosendaal (master)
October 20, 2003, 15:40 (GMT)
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'

Commit Details:

Full Hash: 7f5d06d638ff24444da942cf91c130d5393818cb
SVN Revision: 1364
Parent Commit: 628b002
Lines Changed: +2219, -3137

1 Added Path:

/source/blender/src/interface_draw.c (+1448, -0) (View)

43 Modified Paths:

/source/blender/ftfont/FTF_Api.h (+1, -9) (Diff)
/source/blender/ftfont/intern/FTF_Api.cpp (+3, -8) (Diff)
/source/blender/ftfont/intern/FTF_TTFont.cpp (+8, -33) (Diff)
/source/blender/ftfont/intern/FTF_TTFont.h (+2, -4) (Diff)
/source/blender/include/BIF_interface.h (+6, -12) (Diff)
/source/blender/include/BIF_language.h (+1, -2) (Diff)
/source/blender/include/BIF_resources.h (+30, -77) (Diff)
/source/blender/include/interface.h (+10, -4) (Diff)
/source/blender/makesdna/DNA_userdef_types.h (+17, -1) (Diff)
/source/blender/src/buttons_editing.c (+27, -94) (Diff)
/source/blender/src/buttons_logic.c (+57, -109) (Diff)
/source/blender/src/buttons_object.c (+30, -63) (Diff)
/source/blender/src/buttons_scene.c (+28, -82) (Diff)
/source/blender/src/buttons_script.c (+1, -5) (Diff)
/source/blender/src/buttons_shading.c (+93, -164) (Diff)
/source/blender/src/drawaction.c (+2, -4) (Diff)
/source/blender/src/drawimasel.c (+2, -2) (Diff)
/source/blender/src/drawipo.c (+0, -1) (Diff)
/source/blender/src/drawobject.c (+3, -3) (Diff)
/source/blender/src/drawview.c (+2, -6) (Diff)
/source/blender/src/editscreen.c (+2, -2) (Diff)
/source/blender/src/filesel.c (+1, -2) (Diff)
/source/blender/src/headerbuttons.c (+5, -5) (Diff)
/source/blender/src/header_action.c (+4, -2) (Diff)
/source/blender/src/header_buttonswin.c (+8, -11) (Diff)
/source/blender/src/header_filesel.c (+6, -4) (Diff)
/source/blender/src/header_image.c (+8, -6) (Diff)
/source/blender/src/header_imasel.c (+4, -2) (Diff)
/source/blender/src/header_info.c (+9, -36) (Diff)
/source/blender/src/header_ipo.c (+6, -2) (Diff)
/source/blender/src/header_nla.c (+4, -2) (Diff)
/source/blender/src/header_oops.c (+4, -2) (Diff)
/source/blender/src/header_seq.c (+4, -2) (Diff)
/source/blender/src/header_sound.c (+4, -2) (Diff)
/source/blender/src/header_text.c (+4, -2) (Diff)
/source/blender/src/header_view3d.c (+7, -50) (Diff)
/source/blender/src/interface.c (+164, -2058) (Diff)
/source/blender/src/interface_panel.c (+5, -55) (Diff)
/source/blender/src/language.c (+3, -19) (Diff)
/source/blender/src/resources.c (+141, -110) (Diff)
/source/blender/src/space.c (+44, -69) (Diff)
/source/blender/src/toolbox.c (+9, -9) (Diff)
/source/blender/src/view.c (+2, -2) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021