diff options
author | Ton Roosendaal <ton@blender.org> | 2008-12-12 21:47:12 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2008-12-12 21:47:12 +0300 |
commit | a46ddac1a979b2b94cf3a46c4b6a738841b025dc (patch) | |
tree | 420cc36b4cfc61b6d614f79e267cbcf17e46a6f0 /source/blender/editors/space_view3d | |
parent | faf7965b3ca383d5b9504b644dff2ea40a55eb26 (diff) |
2.5
- Added rudimentary support for Ipo window
(Joshua can check on view2d issues for this? :)
- removed ED_area.h, added ED_space_api.h
Diffstat (limited to 'source/blender/editors/space_view3d')
-rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 41 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_header.c | 166 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/view3d_intern.h | 2 |
3 files changed, 207 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index e2b1cb70a43..d04ca14ffca 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -44,11 +44,15 @@ #include "BKE_global.h" #include "BKE_screen.h" -#include "ED_area.h" +#include "ED_space_api.h" #include "ED_screen.h" #include "BIF_gl.h" +#include "WM_api.h" + +#include "UI_interface.h" +#include "UI_resources.h" #include "UI_view2d.h" #include "view3d_intern.h" // own include @@ -182,7 +186,36 @@ void view3d_keymap(struct wmWindowManager *wm) { } -/* only called once, from screen/spacetypes.c */ +/* add handlers, stuff you only do once or on area/region changes */ +static void view3d_header_area_init(wmWindowManager *wm, ARegion *ar) +{ + UI_view2d_size_update(&ar->v2d, ar->winx, ar->winy); +} + +static void view3d_header_area_draw(const bContext *C, ARegion *ar) +{ + float col[3]; + + /* clear */ + if(ED_screen_area_active(C)) + UI_GetThemeColor3fv(TH_HEADER, col); + else + UI_GetThemeColor3fv(TH_HEADERDESEL, col); + + glClearColor(col[0], col[1], col[2], 0.0); + glClear(GL_COLOR_BUFFER_BIT); + + /* set view2d view matrix for scrolling (without scrollers) */ + UI_view2d_view_ortho(C, &ar->v2d); + + view3d_header_buttons(C, ar); + + /* restore view matrix? */ + UI_view2d_view_restore(C); +} + + +/* only called once, from space/spacetypes.c */ void ED_spacetype_view3d(void) { SpaceType *st= MEM_callocN(sizeof(SpaceType), "spacetype time"); @@ -207,6 +240,10 @@ void ED_spacetype_view3d(void) art= MEM_callocN(sizeof(ARegionType), "spacetype time region"); art->regionid = RGN_TYPE_HEADER; art->minsizey= HEADERY; + art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_VIEW2D; + + art->init= view3d_header_area_init; + art->draw= view3d_header_area_draw; BLI_addhead(&st->regiontypes, art); diff --git a/source/blender/editors/space_view3d/view3d_header.c b/source/blender/editors/space_view3d/view3d_header.c new file mode 100644 index 00000000000..a0e166bc8b1 --- /dev/null +++ b/source/blender/editors/space_view3d/view3d_header.c @@ -0,0 +1,166 @@ +/** + * $Id$ + * + * ***** BEGIN GPL LICENSE BLOCK ***** + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * + * The Original Code is Copyright (C) 2008 Blender Foundation. + * All rights reserved. + * + * + * Contributor(s): Blender Foundation + * + * ***** END GPL LICENSE BLOCK ***** + */ + +#include <string.h> +#include <stdio.h> + +#include "DNA_space_types.h" +#include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_windowmanager_types.h" + +#include "MEM_guardedalloc.h" + +#include "BLI_blenlib.h" + +#include "BKE_global.h" +#include "BKE_screen.h" + +#include "ED_screen.h" +#include "ED_util.h" + +#include "WM_api.h" +#include "WM_types.h" + +#include "BIF_gl.h" +#include "BIF_glutil.h" + +#include "UI_interface.h" +#include "UI_resources.h" +#include "UI_view2d.h" + +#include "view3d_intern.h" + + +/* ************************ header area region *********************** */ + +static void do_viewmenu(bContext *C, void *arg, int event) +{ + +} + +static uiBlock *dummy_viewmenu(bContext *C, uiMenuBlockHandle *handle, void *arg_unused) +{ + ScrArea *curarea= C->area; + uiBlock *block; + short yco= 0, menuwidth=120; + + block= uiBeginBlock(C, handle->region, "dummy_viewmenu", UI_EMBOSSP, UI_HELV); + uiBlockSetButmFunc(block, do_viewmenu, NULL); + + uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Nothing yet", 0, yco-=20, + menuwidth, 19, NULL, 0.0, 0.0, 1, 3, ""); + + if(curarea->headertype==HEADERTOP) { + uiBlockSetDirection(block, UI_DOWN); + } + else { + uiBlockSetDirection(block, UI_TOP); + uiBlockFlipOrder(block); + } + + uiTextBoundsBlock(block, 50); + uiEndBlock(C, block); + + return block; +} + +#define B_NEWSPACE 100 + +static void do_view3d_buttons(bContext *C, void *arg, int event) +{ + switch(event) { + case B_NEWSPACE: + ED_newspace(C->area, C->area->butspacetype); + WM_event_add_notifier(C, WM_NOTE_SCREEN_CHANGED, 0, NULL); + break; + } +} + + +void view3d_header_buttons(const bContext *C, ARegion *ar) +{ + ScrArea *sa= C->area; + uiBlock *block; + int xco, yco= 3; + + block= uiBeginBlock(C, ar, "header buttons", UI_EMBOSS, UI_HELV); + uiBlockSetHandleFunc(block, do_view3d_buttons, NULL); + + if(ED_screen_area_active(C)) uiBlockSetCol(block, TH_HEADER); + else uiBlockSetCol(block, TH_HEADERDESEL); + + xco = 8; + + uiDefIconTextButC(block, ICONTEXTROW,B_NEWSPACE, ICON_VIEW3D, + windowtype_pup(), xco, yco, XIC+10, YIC, + &(C->area->butspacetype), 1.0, SPACEICONMAX, 0, 0, + "Displays Current Window Type. " + "Click for menu of available types."); + + xco += XIC + 14; + + uiBlockSetEmboss(block, UI_EMBOSSN); + if (sa->flag & HEADER_NO_PULLDOWN) { + uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, + ICON_DISCLOSURE_TRI_RIGHT, + xco,yco,XIC,YIC-2, + &(sa->flag), 0, 0, 0, 0, + "Show pulldown menus"); + } + else { + uiDefIconButBitS(block, TOG, HEADER_NO_PULLDOWN, 0, + ICON_DISCLOSURE_TRI_DOWN, + xco,yco,XIC,YIC-2, + &(sa->flag), 0, 0, 0, 0, + "Hide pulldown menus"); + } + uiBlockSetEmboss(block, UI_EMBOSS); + xco+=XIC; + + if((sa->flag & HEADER_NO_PULLDOWN)==0) { + int xmax; + + /* pull down menus */ + uiBlockSetEmboss(block, UI_EMBOSSP); + + xmax= GetButStringLength("View"); + uiDefPulldownBut(block, dummy_viewmenu, C->area, + "View", xco, yco-2, xmax-3, 24, ""); + } + + uiBlockSetEmboss(block, UI_EMBOSS); + + /* always as last */ + sa->headbutlen= xco+XIC+80; // +80 because the last button is not an icon + + uiEndBlock(C, block); + uiDrawBlock(block); +} + + diff --git a/source/blender/editors/space_view3d/view3d_intern.h b/source/blender/editors/space_view3d/view3d_intern.h index 32c3e51c112..40c30269d87 100644 --- a/source/blender/editors/space_view3d/view3d_intern.h +++ b/source/blender/editors/space_view3d/view3d_intern.h @@ -38,6 +38,8 @@ typedef struct ViewDepths { char damaged; } ViewDepths; +/* view3d_header.c */ +void view3d_header_buttons(const bContext *C, ARegion *ar); #endif /* ED_VIEW3D_INTERN_H */ |