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

Default buttons drawing update

Browse Source 
* Big code cleanup and re-organisation, cleaner drawing
* Button alignment now enabled for default theme
* Sliders tweaked and improved
* Tooltip shadow cleaned up

Todo: Alignment looks pretty, but at this stage, what it *means* is not clear or consistent. Need to work out some UI guidelines for when to and when not to use the alignment code.
This commit is contained in:
Matt Ebb
2003-12-07 06:05:08 +00:00
parent e5ab092f46
commit 7ab1c64c7a
2 changed files with 458 additions and 757 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2115,6 +2115,7 @@ static void edit_but(uiBlock *block, uiBut *but, uiEvent *uevent)
glFinish();
didit= 1;
but->rt[3]= 1;
}
/* idle for this poor code */
else PIL_sleep_ms(30);
@@ -2821,21 +2822,17 @@ static uiSaveUnder *ui_draw_but_tip(uiBut *but)
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glEnable(GL_BLEND);
glColor4ub(0, 0, 0, 60);
fdrawline(x1+3, y1-1, x2, y1-1);
fdrawline(x2+1, y1, x2+1, y2-3);
glColor4ub(0, 0, 0, 40);
fdrawline(x1+3, y1-2, x2+1, y1-2);
fdrawline(x2+2, y1-1, x2+2, y2-3);
glColor4ub(0, 0, 0, 20);
fdrawline(x1+3, y1-3, x2+2, y1-3);
fdrawline(x2+3, y1-2, x2+3, y2-3);
glColor4ub(0, 0, 0, 20);
fdrawline(x2, y2, x2+3, y2-3);
glBegin(GL_POLYGON);
gl_round_box(x1+3, y1-1, x2+1, y2-2, 2.0);
gl_round_box(x1+3, y1-2, x2+2, y2-2, 3.0);
glColor4ub(0, 0, 0, 8);
gl_round_box(x1+3, y1-3, x2+3, y2-3, 5.0);
gl_round_box(x1+3, y1-4, x2+4, y2-3, 7.0);
glEnd();
glDisable(GL_BLEND);
@@ -3532,7 +3529,7 @@ void uiBlockEndAlign(uiBlock *block)
uiBut *prev, *but=NULL, *next;
int flag= 0, cols=0, rows=0;
if( BIF_GetThemeValue(TH_BUT_DRAWTYPE) != 2) return;
if ( !((BIF_GetThemeValue(TH_BUT_DRAWTYPE) == 1) || (BIF_GetThemeValue(TH_BUT_DRAWTYPE) == 2))) return;
/* auto align:
- go back to first button of align start (ALIGN_DOWN)