griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- fixed more menu colors

Browse Source 
- left in patch for sgi, seems to work there....
  would like some reports from nvidia windows users though
This commit is contained in:
Ton Roosendaal
2003-10-05 21:00:01 +00:00
parent bc22c485c7
commit 5ebb3aa7ff
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/src/editscreen.c
View File

@@ -2900,6 +2900,7 @@ void drawscreen(void)
sa= sa->next;
}
/* this double draw patch seems to be needed for certain sgi's (octane, indigo2) */
glDrawBuffer(GL_FRONT);
sa= G.curscreen->areabase.first;

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

@@ -2296,7 +2296,8 @@ void uiRoundBox(float minx, float miny, float maxx, float maxy, float rad)
void uiDrawMenuBox(float minx, float miny, float maxx, float maxy)
{
BIF_set_color(MENUCOL, COLORSHADE_MEDIUM);
BIF_set_color(MENUCOL, COLORSHADE_HILITE);
glRectf(minx, miny, maxx, maxy);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -2813,7 +2814,8 @@ static int ui_do_but_MENU(uiBut *but)
block= uiNewBlock(&listb, "menu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
uiBlockSetCol(block, MENUCOL);
md= decompose_menu_string(but->str);
/* columns and row calculation */
@@ -3500,7 +3502,8 @@ static int ui_do_but_ICONROW(uiBut *but)
/* here we go! */
block= uiNewBlock(&listb, "menu", UI_EMBOSSP, UI_HELV, but->win);
block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
uiBlockSetCol(block, MENUCOL);
for(a=(int)but->min; a<=(int)but->max; a++) {
uiDefIconBut(block, BUTM|but->pointype, but->retval, but->icon+(a-but->min), 0, (short)(18*a), (short)(but->x2-but->x1-4), 18, but->poin, (float)a, 0.0, 0, 0, "");
}
@@ -3532,7 +3535,7 @@ static int ui_do_but_ICONTEXTROW(uiBut *but)
block= uiNewBlock(&listb, "menu", UI_EMBOSSP, UI_HELV, but->win);
block->flag= UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT;
uiBlockSetCol(block, MENUCOL);
md= decompose_menu_string(but->str);
/* size and location */
@@ -5665,7 +5668,8 @@ short pupmenu_col(char *instr, int maxrow)
block= uiNewBlock(&listb, "menu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
uiBlockSetFlag(block, UI_BLOCK_LOOP|UI_BLOCK_REDRAW|UI_BLOCK_NUMSELECT);
uiBlockSetCol(block, MENUCOL);
md= decompose_menu_string(instr);
/* collumns and row calculation */