archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

fixed ui_draw_but_TOG3 for correct coloring non-ftgl texts.

Browse Source
This commit is contained in:
Rob Haarsma
2003-05-08 13:44:16 +00:00
parent 154a49fbba
commit d53ca699c9
1 changed files with 10 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
source/blender/src/interface.c
View File

@@ -701,7 +701,7 @@ static void ui_draw_but_BUT(uiBut *but)
static void ui_draw_but_TOG3(uiBut *but) static void ui_draw_but_TOG3(uiBut *but)
{ {
float x; float x, r, g, b;
but->embossfunc(but->col, but->aspect, but->x1, but->y1, but->x2, but->y2, but->flag); but->embossfunc(but->col, but->aspect, but->x1, but->y1, but->x2, but->y2, but->flag);
@@ -720,60 +720,35 @@ static void ui_draw_but_TOG3(uiBut *but)
if( BTST( sp[1], but->bitnr )) ok= 1; if( BTST( sp[1], but->bitnr )) ok= 1;
} }
if(but->flag & UI_TEXT_LEFT) x= but->x1+4.0;
else x= (but->x1+but->x2-but->strwidth+1)/2.0;
glRasterPos2f( x, (but->y1+but->y2- 9.0)/2.0);
// silly structure for colored texts
if (ok) { if (ok) {
glColor3ub(255, 255, 0); glColor3ub(255, 255, 0);
r= g= 1.0;
#ifdef INTERNATIONAL b= 0.0;
if(G.ui_international == TRUE)
if(U.transopts & TR_BUTTONS) // BUTTON TEXTS
FTF_DrawStringRGB(but->drawstr+but->ofs, FTF_USE_GETTEXT | FTF_INPUT_UTF8, 1.0, 1.0, 0.0);
else
FTF_DrawStringRGB(but->drawstr+but->ofs, FTF_NO_TRANSCONV | FTF_INPUT_UTF8, 1.0, 1.0, 0.0);
else
BMF_DrawString(but->font, but->drawstr+but->ofs);
#else
BMF_DrawString(but->font, but->drawstr+but->ofs);
#endif
} else { } else {
glColor3ub(255, 255, 255); glColor3ub(255, 255, 255);
r= g= b= 1.0;
#ifdef INTERNATIONAL
if(G.ui_international == TRUE)
if(U.transopts & TR_BUTTONS) // BUTTON TEXTS
FTF_DrawString(but->drawstr+but->ofs, FTF_USE_GETTEXT | FTF_INPUT_UTF8, but->flag & UI_SELECT);
else
FTF_DrawString(but->drawstr+but->ofs, FTF_NO_TRANSCONV | FTF_INPUT_UTF8, but->flag & UI_SELECT);
else
BMF_DrawString(but->font, but->drawstr+but->ofs);
#else
BMF_DrawString(but->font, but->drawstr+but->ofs);
#endif
} }
} else { } else {
glColor3ub(0, 0, 0); glColor3ub(0, 0, 0);
r= g= b= 0.0;
}
if(but->flag & UI_TEXT_LEFT) x= but->x1+4.0; if(but->flag & UI_TEXT_LEFT) x= but->x1+4.0;
else x= (but->x1+but->x2-but->strwidth+1)/2.0; else x= (but->x1+but->x2-but->strwidth+1)/2.0;
glRasterPos2f( x, (but->y1+but->y2- 9.0)/2.0); glRasterPos2f( x, (but->y1+but->y2- 9.0)/2.0);
#ifdef INTERNATIONAL #ifdef INTERNATIONAL
if(G.ui_international == TRUE) if(G.ui_international == TRUE)
if(U.transopts & TR_BUTTONS) // BUTTON TEXTS if(U.transopts & TR_BUTTONS) // BUTTON TEXTS
FTF_DrawString(but->drawstr+but->ofs, FTF_USE_GETTEXT | FTF_INPUT_UTF8, but->flag & UI_SELECT); FTF_DrawStringRGB(but->drawstr+but->ofs, FTF_USE_GETTEXT | FTF_INPUT_UTF8, r, g, b);
else else
FTF_DrawString(but->drawstr+but->ofs, FTF_NO_TRANSCONV | FTF_INPUT_UTF8, but->flag & UI_SELECT); FTF_DrawStringRGB(but->drawstr+but->ofs, FTF_NO_TRANSCONV | FTF_INPUT_UTF8, r, g, b);
else else
BMF_DrawString(but->font, but->drawstr+but->ofs); BMF_DrawString(but->font, but->drawstr+but->ofs);
#else #else
BMF_DrawString(but->font, but->drawstr+but->ofs); BMF_DrawString(but->font, but->drawstr+but->ofs);
#endif #endif
}
} }
} }