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

added Matt Ebb's icons for the new headerbuttons.

Browse Source
This commit is contained in:
Rob Haarsma
2003-05-09 14:03:34 +00:00
parent 29806ccb0d
commit 2292658124
4 changed files with 1358 additions and 1206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/include/BIF_resources.h
View File

@@ -214,8 +214,8 @@ typedef enum {
ICON_FULLSCREEN, ICON_FULLSCREEN,
ICON_SPLITSCREEN, ICON_SPLITSCREEN,
ICON_RIGHTARROW_THIN, ICON_RIGHTARROW_THIN,
ICON_BLANK27, ICON_DISCLOSURE_TRI_RIGHT,
ICON_BLANK28, ICON_DISCLOSURE_TRI_DOWN,
ICON_SCENE_SEPIA, ICON_SCENE_SEPIA,
ICON_SCENE_DEHLT, ICON_SCENE_DEHLT,
ICON_OBJECT, ICON_OBJECT,
@@ -229,8 +229,8 @@ typedef enum {
ICON_IPO_DEHLT, ICON_IPO_DEHLT,
ICON_LIBRARY_DEHLT, ICON_LIBRARY_DEHLT,
ICON_IMAGE_DEHLT, ICON_IMAGE_DEHLT,
ICON_BLANK29, ICON_WINDOW_FULLSCREEN,
ICON_BLANK30, ICON_WINDOW_WINDOW,
ICON_BLANK31, ICON_BLANK31,
ICON_BLENDER, ICON_BLENDER,
@@ -319,4 +319,3 @@ void BIF_draw_icon_blended (BIFIconID icon, BIFColorID color, BIFColorShade shad
void BIF_set_color (BIFColorID color, BIFColorShade shade); void BIF_set_color (BIFColorID color, BIFColorShade shade);
#endif /* BIF_ICONS_H */ #endif /* BIF_ICONS_H */

2495
source/blender/src/blenderbuttons.c
View File

File diff suppressed because it is too large Load Diff

32
source/blender/src/headerbuttons.c
View File

@@ -1409,6 +1409,10 @@ void do_global_buttons(unsigned short event)
#ifdef _WIN32 // FULLSCREEN #ifdef _WIN32 // FULLSCREEN
case B_FLIPFULLSCREEN: case B_FLIPFULLSCREEN:
if(U.uiflag & FLIPFULLSCREEN)
U.uiflag &= ~FLIPFULLSCREEN;
else
U.uiflag |= FLIPFULLSCREEN;
mainwindow_toggle_fullscreen((U.uiflag & FLIPFULLSCREEN)); mainwindow_toggle_fullscreen((U.uiflag & FLIPFULLSCREEN));
break; break;
#endif #endif
@@ -3400,15 +3404,15 @@ void info_buttons(void)
int xmax; int xmax;
sprintf(naam, "header %d", curarea->headwin); sprintf(naam, "header %d", curarea->headwin);
block= uiNewBlock(&curarea->uiblocks, naam, UI_EMBOSSM, UI_HELV, curarea->headwin); block= uiNewBlock(&curarea->uiblocks, naam, UI_EMBOSSN, UI_HELV, curarea->headwin);
uiBlockSetCol(block, BUTGREY); uiBlockSetCol(block, BUTGREY);
if(U.uiflag & FLIPINFOMENU) { if(U.uiflag & FLIPINFOMENU) {
uiDefIconButS(block, TOG|BIT|6, B_FLIPINFOMENU, ICON_RIGHTARROW, uiDefIconButS(block, TOG|BIT|6, B_FLIPINFOMENU, ICON_DISCLOSURE_TRI_RIGHT,
xco,2,XIC,YIC-2, xco,2,XIC,YIC-2,
&(U.uiflag), 0, 0, 0, 0, "View pulldown menus");/* dir */ &(U.uiflag), 0, 0, 0, 0, "View pulldown menus");/* dir */
} else { } else {
uiDefIconButS(block, TOG|BIT|6, B_FLIPINFOMENU, ICON_DOWNARROW_HLT, uiDefIconButS(block, TOG|BIT|6, B_FLIPINFOMENU, ICON_DISCLOSURE_TRI_DOWN,
xco,2,XIC,YIC-2, xco,2,XIC,YIC-2,
&(U.uiflag), 0, 0, 0, 0, "Hide pulldown menus");/* dir */ &(U.uiflag), 0, 0, 0, 0, "Hide pulldown menus");/* dir */
} }
@@ -3493,16 +3497,28 @@ void info_buttons(void)
#ifdef _WIN32 // FULLSCREEN #ifdef _WIN32 // FULLSCREEN
if(U.uiflag & FLIPFULLSCREEN) { if(U.uiflag & FLIPFULLSCREEN) {
uiDefIconButS(block, TOG|BIT|7, B_FLIPFULLSCREEN, ICON_SPLITSCREEN, uiDefIconBut(block, BUT, B_FLIPFULLSCREEN, ICON_WINDOW_WINDOW,
(short)(curarea->winx-(XIC*2)-2), 0,XIC,YIC, (short)(curarea->winx-(XIC*2)-2), 0,XIC,YIC,
&(U.uiflag), 0, 0, 0, 0, "Toggle Blender fullscreen");/* dir */ 0, 0, 0, 0, 0, "Toggle Blender fullscreen");/* dir */
} else { } else {
uiDefIconButS(block, TOG|BIT|7, B_FLIPFULLSCREEN, ICON_FULLSCREEN, uiDefIconBut(block, BUT, B_FLIPFULLSCREEN, ICON_WINDOW_FULLSCREEN,
(short)(curarea->winx-(XIC*2)-2), 0,XIC,YIC, (short)(curarea->winx-(XIC*2)-2), 0,XIC,YIC,
&(U.uiflag), 0, 0, 0, 0, "Toggle Blender fullscreen");/* dir */ 0, 0, 0, 0, 0, "Toggle Blender fullscreen");/* dir */
} }
#endif #endif
/*
#ifdef _WIN32 // FULLSCREEN
if(U.uiflag & FLIPFULLSCREEN) {
uiDefIconButS(block, TOG|BIT|7, B_FLIPFULLSCREEN, ICON_WINDOW_WINDOW,
(short)(curarea->winx-(XIC*2)-2), 0,XIC,YIC,
&(U.uiflag), 0, 0, 0, 0, "Toggle Blender fullscreen");
} else {
uiDefIconButS(block, TOG|BIT|7, B_FLIPFULLSCREEN, ICON_WINDOW_FULLSCREEN,
(short)(curarea->winx-(XIC*2)-2), 0,XIC,YIC,
&(U.uiflag), 0, 0, 0, 0, "Toggle Blender fullscreen");
}
#endif
*/
} }
uiDrawBlock(block); uiDrawBlock(block);

28
source/blender/src/usiblender.c
View File

@@ -183,6 +183,20 @@ int BIF_read_homefile(void)
/* disable autoplay in .B.blend... */ /* disable autoplay in .B.blend... */
G.fileflags &= ~G_FILE_AUTOPLAY; G.fileflags &= ~G_FILE_AUTOPLAY;
#ifdef _WIN32 // FULLSCREEN
/* choose window startmode */
switch (G.windowstate){
case G_WINDOWSTATE_USERDEF: /* use the usersetting */
break;
case G_WINDOWSTATE_FULLSCREEN: /* force fullscreen */
U.uiflag |= FLIPFULLSCREEN;
break;
case G_WINDOWSTATE_BORDER: /* force with borders */
U.uiflag &= ~FLIPFULLSCREEN;
}
mainwindow_toggle_fullscreen ((U.uiflag & FLIPFULLSCREEN));
#endif
if (BLI_streq(U.tempdir, "/")) { if (BLI_streq(U.tempdir, "/")) {
char *tmp= getenv("TEMP"); char *tmp= getenv("TEMP");
@@ -468,20 +482,6 @@ void BIF_init(void)
else else
G.ui_international = FALSE; G.ui_international = FALSE;
#endif // INTERNATIONAL #endif // INTERNATIONAL
#ifdef _WIN32 // FULLSCREEN
/* choose window startmode */
switch (G.windowstate){
case G_WINDOWSTATE_USERDEF: /* use the usersetting */
break;
case G_WINDOWSTATE_FULLSCREEN: /* force fullscreen */
U.uiflag |= FLIPFULLSCREEN;
break;
case G_WINDOWSTATE_BORDER: /* force with borders */
U.uiflag &= ~FLIPFULLSCREEN;
}
mainwindow_toggle_fullscreen ((U.uiflag & FLIPFULLSCREEN));
#endif
} }
/***/ /***/