diff options
| author | Rob Haarsma <phaseIV@zonnet.nl> | 2004-01-13 17:50:45 +0300 |
|---|---|---|
| committer | Rob Haarsma <phaseIV@zonnet.nl> | 2004-01-13 17:50:45 +0300 |
| commit | 4a8f52f61983f33714cdd57d0064a4df208357b1 (patch) | |
| tree | 96677fd6134ae92074fca3f43ea64f32ca39b820 /source/blender/src/interface_panel.c | |
| parent | d74da9789a2124f1a8a3cf6f8f9070b127dff73d (diff) | |
Converted the Userpreference buttons to zr's new ButBit calls.
Also added USER_* to each define located in DNA_userdef.h.
Diffstat (limited to 'source/blender/src/interface_panel.c')
| -rw-r--r-- | source/blender/src/interface_panel.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/src/interface_panel.c b/source/blender/src/interface_panel.c index 156f9bc89f0..4be3e362e20 100644 --- a/source/blender/src/interface_panel.c +++ b/source/blender/src/interface_panel.c @@ -672,7 +672,7 @@ static char *ui_block_cut_str(uiBlock *block, char *str, short okwidth) if(ofs>127) return str; - width= block->aspect*BIF_GetStringWidth(block->curfont, str, (U.transopts & TR_BUTTONS)); + width= block->aspect*BIF_GetStringWidth(block->curfont, str, (U.transopts & USER_TR_BUTTONS)); if(width <= okwidth) return str; strcpy(str1, str); @@ -721,7 +721,7 @@ static void ui_draw_panel_header(uiBlock *block) BIF_ThemeColor(TH_TEXT_HI); glRasterPos2f(4+block->minx+pnl_icons, block->maxy+5); - BIF_DrawString(block->curfont, block->panel->panelname, (U.transopts & TR_BUTTONS)); + BIF_DrawString(block->curfont, block->panel->panelname, (U.transopts & USER_TR_BUTTONS)); return; } @@ -739,7 +739,7 @@ static void ui_draw_panel_header(uiBlock *block) BIF_ThemeColor(TH_TEXT); glRasterPos2f(16+pnl_icons+a*width, panel->sizey+4); str= ui_block_cut_str(block, pa->panelname, (short)(width-10)); - BIF_DrawString(block->curfont, str, (U.transopts & TR_BUTTONS)); + BIF_DrawString(block->curfont, str, (U.transopts & USER_TR_BUTTONS)); a++; } @@ -752,7 +752,7 @@ static void ui_draw_panel_header(uiBlock *block) BIF_ThemeColor(TH_TEXT_HI); glRasterPos2f(16+pnl_icons+a*width, panel->sizey+4); str= ui_block_cut_str(block, pa->panelname, (short)(width-10)); - BIF_DrawString(block->curfont, str, (U.transopts & TR_BUTTONS)); + BIF_DrawString(block->curfont, str, (U.transopts & USER_TR_BUTTONS)); a++; } @@ -785,7 +785,7 @@ void ui_draw_panel(uiBlock *block) if(panel->control & UI_PNL_CLOSE) ofsx+= PNL_ICON; BIF_ThemeColor(TH_TEXT_HI); glRasterPos2f(4+block->minx+ofsx, block->maxy+5); - BIF_DrawString(block->curfont, panel->panelname, (U.transopts & TR_BUTTONS)); + BIF_DrawString(block->curfont, panel->panelname, (U.transopts & USER_TR_BUTTONS)); // border if(panel->flag & PNL_SELECT) { |