From 589ef22aef3adb7d722b8adb7cc12dda4b1c93c3 Mon Sep 17 00:00:00 2001 From: Matt Ebb Date: Sat, 10 Jan 2004 13:41:03 +0000 Subject: [PATCH] * Fixed a silly problem when changing the colours of the 'Neutral' button theme entry (which changed both the outline of buttons and various other grey buttons). Added a new theme colour 'Outline' and left 'Neutral' to remain, well, neutral. Thanks Desoto for the report. --- source/blender/include/BIF_resources.h | 1 + source/blender/makesdna/DNA_userdef_types.h | 2 ++ source/blender/src/interface_draw.c | 8 +++--- source/blender/src/resources.c | 28 ++++++++++++--------- source/blender/src/space.c | 6 ++--- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h index a838b9a79e9..8900df470ca 100644 --- a/source/blender/include/BIF_resources.h +++ b/source/blender/include/BIF_resources.h @@ -265,6 +265,7 @@ enum { TH_AUTO, /* for buttons, to signal automatic color assignment */ // uibutton colors + TH_BUT_OUTLINE, TH_BUT_NEUTRAL, TH_BUT_ACTION, TH_BUT_SETTING, diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index 9d50ff7fadf..72646db2207 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -40,6 +40,7 @@ // global, button colors typedef struct ThemeUI { + char outline[4]; char neutral[4]; char action[4]; char setting[4]; @@ -58,6 +59,7 @@ typedef struct ThemeUI { char but_drawtype, pad; short pad1; + int pad2; } ThemeUI; diff --git a/source/blender/src/interface_draw.c b/source/blender/src/interface_draw.c index b17d5010297..058ee4c66cd 100644 --- a/source/blender/src/interface_draw.c +++ b/source/blender/src/interface_draw.c @@ -209,10 +209,10 @@ static void ui_draw_icon(uiBut *but, BIFIconID icon) #define MM_WHITE_OP glColor4ub(255, 255, 255, 60) #define MM_WHITE_TR glColor4ub(255, 255, 255, 0) -#define MM_LIGHT BIF_ThemeColorShade(TH_BUT_NEUTRAL, 45) -#define MM_MEDIUM BIF_ThemeColor(TH_BUT_NEUTRAL) -#define MM_GREY BIF_ThemeColorShade(TH_BUT_NEUTRAL, -45) -#define MM_DARK BIF_ThemeColorShade(TH_BUT_NEUTRAL, -80) +#define MM_LIGHT BIF_ThemeColorShade(TH_BUT_OUTLINE, 45) +#define MM_MEDIUM BIF_ThemeColor(TH_BUT_OUTLINE) +#define MM_GREY BIF_ThemeColorShade(TH_BUT_OUTLINE, -45) +#define MM_DARK BIF_ThemeColorShade(TH_BUT_OUTLINE, -80) /* base shaded button */ static void shaded_button(float x1, float y1, float x2, float y2, float asp, int colorid, int flag, int mid) diff --git a/source/blender/src/resources.c b/source/blender/src/resources.c index 151962b47e7..3e402467ca7 100644 --- a/source/blender/src/resources.c +++ b/source/blender/src/resources.c @@ -293,6 +293,8 @@ char *BIF_ThemeGetColorPtr(bTheme *btheme, int spacetype, int colorid) if(colorid < TH_THEMEUI) { switch(colorid) { + case TH_BUT_OUTLINE: + cp= btheme->tui.outline; break; case TH_BUT_NEUTRAL: cp= btheme->tui.neutral; break; case TH_BUT_ACTION: @@ -460,6 +462,7 @@ void BIF_InitTheme(void) BIF_SetTheme(NULL); // make sure the global used in this file is set /* UI buttons (todo) */ + SETCOL(btheme->tui.outline, 0xA0,0xA0,0xA0, 255); SETCOL(btheme->tui.neutral, 0xA0,0xA0,0xA0, 255); SETCOL(btheme->tui.action, 0xB0,0xA0,0x90, 255); SETCOL(btheme->tui.setting, 0x88,0xA0,0xA4, 255); @@ -602,6 +605,7 @@ char *BIF_ThemeColorsPup(int spacetype) char str[32]; if(spacetype==0) { + sprintf(str, "Outline %%x%d|", TH_BUT_OUTLINE); strcat(cp, str); sprintf(str, "Neutral %%x%d|", TH_BUT_NEUTRAL); strcat(cp, str); sprintf(str, "Action %%x%d|", TH_BUT_ACTION); strcat(cp, str); sprintf(str, "Setting %%x%d|", TH_BUT_SETTING); strcat(cp, str); @@ -611,13 +615,13 @@ char *BIF_ThemeColorsPup(int spacetype) sprintf(str, "Text Input %%x%d|", TH_BUT_TEXTFIELD); strcat(cp, str); sprintf(str, "Popup %%x%d|", TH_BUT_POPUP); strcat(cp, str); sprintf(str, "Text %%x%d|", TH_BUT_TEXT); strcat(cp, str); - sprintf(str, "Text hilight %%x%d|", TH_BUT_TEXT_HI); strcat(cp, str); + sprintf(str, "Text Highlight %%x%d|", TH_BUT_TEXT_HI); strcat(cp, str); strcat(cp,"%l|"); sprintf(str, "Menu Background %%x%d|", TH_MENU_BACK); strcat(cp, str); sprintf(str, "Menu Item %%x%d|", TH_MENU_ITEM); strcat(cp, str); - sprintf(str, "Menu Item hilight %%x%d|", TH_MENU_HILITE); strcat(cp, str); + sprintf(str, "Menu Item Highlight %%x%d|", TH_MENU_HILITE); strcat(cp, str); sprintf(str, "Menu Text %%x%d|", TH_MENU_TEXT); strcat(cp, str); - sprintf(str, "Menu Text hilight %%x%d|", TH_MENU_TEXT_HI); strcat(cp, str); + sprintf(str, "Menu Text Highlight %%x%d|", TH_MENU_TEXT_HI); strcat(cp, str); strcat(cp,"%l|"); sprintf(str, "Drawtype %%x%d|", TH_BUT_DRAWTYPE); strcat(cp, str); } @@ -625,7 +629,7 @@ char *BIF_ThemeColorsPup(int spacetype) // first defaults for each space sprintf(str, "Background %%x%d|", TH_BACK); strcat(cp, str); sprintf(str, "Text %%x%d|", TH_TEXT); strcat(cp, str); - sprintf(str, "Text hilight %%x%d|", TH_TEXT_HI); strcat(cp, str); + sprintf(str, "Text Highlight %%x%d|", TH_TEXT_HI); strcat(cp, str); sprintf(str, "Header %%x%d|", TH_HEADER); strcat(cp, str); if(spacetype==SPACE_VIEW3D) { @@ -648,7 +652,7 @@ char *BIF_ThemeColorsPup(int spacetype) sprintf(str, "Panel %%x%d|", TH_PANEL); strcat(cp, str); strcat(cp,"%l|"); sprintf(str, "Window Sliders %%x%d|", TH_SHADE1); strcat(cp, str); - sprintf(str, "Buttons back %%x%d|", TH_SHADE2); strcat(cp, str); + sprintf(str, "Ipo Channels %%x%d|", TH_SHADE2); strcat(cp, str); sprintf(str, "Vertex %%x%d|", TH_VERTEX); strcat(cp, str); sprintf(str, "Vertex Selected %%x%d|", TH_VERTEX_SELECT); strcat(cp, str); } @@ -665,16 +669,16 @@ char *BIF_ThemeColorsPup(int spacetype) else if(spacetype==SPACE_ACTION) { //sprintf(str, "Panel %%x%d|", TH_PANEL); strcat(cp, str); strcat(cp,"%l|"); - sprintf(str, "RVK sliders %%x%d|", TH_FACE); strcat(cp, str); + sprintf(str, "RVK Sliders %%x%d|", TH_FACE); strcat(cp, str); sprintf(str, "View Sliders %%x%d|", TH_SHADE1); strcat(cp, str); - sprintf(str, "Bars %%x%d|", TH_SHADE2); strcat(cp, str); - sprintf(str, "Bars selected %%x%d|", TH_HILITE); strcat(cp, str); + sprintf(str, "Channels %%x%d|", TH_SHADE2); strcat(cp, str); + sprintf(str, "Channels Selected %%x%d|", TH_HILITE); strcat(cp, str); } else if(spacetype==SPACE_SEQ) { - sprintf(str, "Window sliders %%x%d|", TH_SHADE1); strcat(cp, str); + sprintf(str, "Window Sliders %%x%d|", TH_SHADE1); strcat(cp, str); } else if(spacetype==SPACE_SOUND) { - sprintf(str, "Window slider %%x%d|", TH_SHADE1); strcat(cp, str); + sprintf(str, "Window Slider %%x%d|", TH_SHADE1); strcat(cp, str); } else if(spacetype==SPACE_BUTS) { sprintf(str, "Panel %%x%d|", TH_PANEL); strcat(cp, str); @@ -683,8 +687,8 @@ char *BIF_ThemeColorsPup(int spacetype) sprintf(str, "Main Shade %%x%d|", TH_SHADE1); strcat(cp, str); } else if(spacetype==SPACE_TEXT) { - sprintf(str, "Scroll bar %%x%d|", TH_SHADE1); strcat(cp, str); - sprintf(str, "Selected text %%x%d|", TH_SHADE2); strcat(cp, str); + sprintf(str, "Scroll Bar %%x%d|", TH_SHADE1); strcat(cp, str); + sprintf(str, "Selected Text %%x%d|", TH_SHADE2); strcat(cp, str); sprintf(str, "Cursor %%x%d|", TH_HILITE); strcat(cp, str); } } diff --git a/source/blender/src/space.c b/source/blender/src/space.c index f8e97ce33a8..840196fcc4e 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -1818,9 +1818,9 @@ void info_user_themebuts(uiBlock *block, short y1, short y2, short y3) uiDefBut(block, TEX, B_NAME_THEME, "", 255,y3,200,20, btheme->name, 1.0, 30.0, 0, 0, "Rename theme"); /* main choices pup */ - uiDefButS(block, MENU, B_CHANGE_THEME, "UI and Buttons %x1|3D View %x2|Ipo Curve Editor %x3|Action Editor %x4|" - "NLA Editor %x5|UV/Image Editor %x6|Video Sequence Editor %x7|Audio Timeline %x8|Text Editor %x9|User Preferences %x10|" - "OOPS Schematic %x11|Buttons Window %x12|File Browser %x13|Image Browser %x14", + uiDefButS(block, MENU, B_CHANGE_THEME, "UI and Buttons %x1|%l|3D View %x2|%l|Ipo Curve Editor %x3|Action Editor %x4|" + "NLA Editor %x5|%l|UV/Image Editor %x6|Video Sequence Editor %x7|Audio Timeline %x8|Text Editor %x9|%l|User Preferences %x10|" + "OOPS Schematic %x11|Buttons Window %x12|%l|File Browser %x13|Image Browser %x14", 255,y2,200,20, &curmain, 0, 0, 0, 0, "Specify theme for..."); if(curmain==1) spacetype= 0; else if(curmain==2) spacetype= SPACE_VIEW3D;