diff options
author | Ton Roosendaal <ton@blender.org> | 2009-04-10 18:06:24 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2009-04-10 18:06:24 +0400 |
commit | d2cc19dcc65e2684894ba5b1e413b4b69cb09742 (patch) | |
tree | 5a221755b635251d3a42f68cc80a2dc91eae7ec1 /source/blender/editors/interface/interface_panel.c | |
parent | a4c4ee2f99da48012e1a85d295cf1baf3bec3f95 (diff) |
2.5
More font style work;
- hooked up almost all ui buttons code to new font
system, including text clipping
- panel headers scale now too to smaller fonts
- added further style hints, for shadow/emboss. Is all going to
be in UI designer control!
- for fun; changed layout engine to spread vertical buttons in
window width
Next: removal of all usage of old font system, using 'styles'.
Will also move font blurring to blenfont module.
Diffstat (limited to 'source/blender/editors/interface/interface_panel.c')
-rw-r--r-- | source/blender/editors/interface/interface_panel.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index be14c963136..6d7a0eae6af 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -570,7 +570,7 @@ static void ui_draw_panel_header_style(ARegion *ar, uiStyle *style, Panel *panel hrect.ymin= rect->ymax; hrect.xmax= rect->xmax; hrect.ymax= rect->ymax + PNL_HEADER; - uiFontStyleDraw(&style->paneltitle, &hrect, activename); + uiStyleFontDraw(&style->paneltitle, &hrect, activename); return; } @@ -591,16 +591,15 @@ static void ui_draw_panel_header_style(ARegion *ar, uiStyle *style, Panel *panel hrect.ymin= rect->ymax; hrect.xmax= hrect.xmin + width; hrect.ymax= hrect.ymin + PNL_HEADER; - uiFontStyleDraw(&style->paneltitle, &hrect, panelname); + uiStyleFontDraw(&style->paneltitle, &hrect, panelname); a++; } } } -void ui_draw_panel(ARegion *ar, uiBlock *block, rcti *rect) +void ui_draw_panel(ARegion *ar, uiStyle *style, uiBlock *block, rcti *rect) { - uiStyle *style= U.uistyles.first; // XXX pass on Panel *panel= block->panel, *prev; int ofsx; |