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

* Some more 2.5 theme updates

Browse Source
This commit is contained in:
Matt Ebb
2009-02-09 02:54:40 +00:00
parent 0139d9d121
commit 85231e5fd4
4 changed files with 24 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/editors/include/UI_interface.h
View File

@@ -84,6 +84,7 @@ typedef struct uiPopupBlockHandle uiPopupBlockHandle;
#define UI_BLOCK_NO_HILITE 64 /* XXX 2.5 not implemented */
#define UI_BLOCK_MOVEMOUSE_QUIT 128
#define UI_BLOCK_KEEP_OPEN 256
#define UI_BLOCK_POPUP 512
/* uiPopupBlockHandle->menuretval */
#define UI_RETURN_CANCEL 1 /* cancel all menus cascading */

7
source/blender/editors/interface/interface_draw.c
View File

@@ -2163,7 +2163,12 @@ void uiDrawMenuBox(float minx, float miny, float maxx, float maxy, short flag, s
UI_GetThemeColor4ubv(TH_MENU_BACK, col);
if (rounded) {
if (direction == UI_DOWN) {
if (flag & UI_BLOCK_POPUP) {
uiSetRoundBox(15);
miny -= 4.0;
maxy += 4.0;
}
else if (direction == UI_DOWN) {
uiSetRoundBox(12);
miny -= 4.0;
} else if (direction == UI_TOP) {

1
source/blender/editors/interface/interface_regions.c
View File

@@ -682,6 +682,7 @@ uiPopupBlockHandle *ui_popup_block_create(bContext *C, ARegion *butregion, uiBut
saferct= MEM_callocN(sizeof(uiSafetyRct), "uiSafetyRct");
saferct->safety= block->safety;
BLI_addhead(&block->saferct, saferct);
block->flag |= UI_BLOCK_POPUP;
}
/* the block and buttons were positioned in window space as in 2.4x, now

32
source/blender/editors/interface/resources.c
View File

@@ -439,19 +439,19 @@ void ui_theme_init_userdef(void)
SETCOL(btheme->tipo.back, 120, 120, 120, 255);
SETCOL(btheme->tipo.header, 195, 195, 195, 255);
SETCOL(btheme->tipo.panel, 255, 255, 255, 150);
SETCOL(btheme->tipo.shade1, 172, 172, 172, 100);
SETCOL(btheme->tipo.shade2, 0x70, 0x70, 0x70, 100);
SETCOL(btheme->tipo.vertex, 0xff, 0x70, 0xff, 255);
SETCOL(btheme->tipo.vertex_select, 0xff, 0xff, 0x70, 255);
SETCOL(btheme->tipo.shade1, 172, 172, 172, 100);
SETCOL(btheme->tipo.shade2, 0x70, 0x70, 0x70, 100);
SETCOL(btheme->tipo.vertex, 0, 0, 0, 255);
SETCOL(btheme->tipo.vertex_select, 255, 133, 0, 255);
SETCOL(btheme->tipo.hilite, 0x60, 0xc0, 0x40, 255);
btheme->tipo.vertex_size= 3;
SETCOL(btheme->tipo.handle_vertex, 0xff, 0x70, 0xff, 255);
SETCOL(btheme->tipo.handle_vertex_select, 0xff, 0xff, 0x70, 255);
SETCOL(btheme->tipo.handle_vertex, 0, 0, 0, 255);
SETCOL(btheme->tipo.handle_vertex_select, 255, 133, 0, 255);
btheme->tipo.handle_vertex_size= 3;
SETCOL(btheme->tipo.ds_channel, 0x36, 0x13, 0xca, 255);
SETCOL(btheme->tipo.ds_subchannel, 0x60, 0x43, 0xd2, 255);
SETCOL(btheme->tipo.ds_channel, 82, 96, 110, 255);
SETCOL(btheme->tipo.ds_subchannel, 124, 137, 150, 255);
/* space file */
/* to have something initialized */
@@ -478,8 +478,8 @@ void ui_theme_init_userdef(void)
SETCOL(btheme->tact.strip, 78, 78, 78, 255);
SETCOL(btheme->tact.group, 22, 112, 0, 255);
SETCOL(btheme->tact.group_active, 125, 233, 96, 255);
SETCOL(btheme->tact.ds_channel, 0x36, 0x13, 0xca, 255);
SETCOL(btheme->tact.ds_subchannel, 0x60, 0x43, 0xd2, 255);
SETCOL(btheme->tact.ds_channel, 82, 96, 110, 255);
SETCOL(btheme->tact.ds_subchannel, 124, 137, 150, 255);
/* space nla */
@@ -511,12 +511,12 @@ void ui_theme_init_userdef(void)
/* space image */
btheme->tima= btheme->tv3d;
SETCOL(btheme->tima.back, 53, 53, 53, 255);
SETCOL(btheme->tima.vertex, 0xff, 0x70, 0xff, 255);
SETCOL(btheme->tima.vertex_select, 0xff, 0xff, 0x70, 255);
btheme->tima.vertex_size= 2;
btheme->tima.facedot_size= 2;
SETCOL(btheme->tima.face, 0, 50, 150, 40);
SETCOL(btheme->tima.face_select, 200, 100, 200, 80);
SETCOL(btheme->tima.vertex, 0, 0, 0, 255);
SETCOL(btheme->tima.vertex_select, 255, 133, 0, 255);
btheme->tima.vertex_size= 3;
btheme->tima.facedot_size= 3;
SETCOL(btheme->tima.face, 255, 255, 255, 10);
SETCOL(btheme->tima.face_select, 255, 133, 0, 60);
SETCOL(btheme->tima.editmesh_active, 255, 255, 255, 128);
/* space imageselect */