2.5

- found fix for time-space view2d when increasing height of area,   it has min/max Y zoom stored based on size of area... needs 
  smarter way.

- outliner: header file added, area switch menu + dummy pulldown. 
  this will become template for other space types...

5 files changed, 184 insertions, 8 deletions

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 1685f57dace..f7638ae1d10 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -5092,6 +5092,9 @@ static void area_add_window_regions(ScrArea *sa, SpaceLink *sl, ListBase *lb)
 				ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM);
 				ar->v2d.align |= V2D_ALIGN_NO_NEG_Y;
 				ar->v2d.keepofs |= V2D_LOCKOFS_Y;
+				
+				/* XXX hrmf, force Y zoom to be fixed? */
+				ar->v2d.min[1]= ar->v2d.max[1]= 500.0;
 			}
 				break;
 			//case SPACE_XXX: // FIXME... add other ones
diff --git a/source/blender/editors/space_outliner/outliner_header.c b/source/blender/editors/space_outliner/outliner_header.c
new file mode 100644
index 00000000000..5026c4d2137
--- /dev/null
+++ b/source/blender/editors/space_outliner/outliner_header.c
@@ -0,0 +1,167 @@
+/**
+ * $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_area.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 "outliner_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_outliner_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 outliner_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_outliner_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_outliner/outliner_intern.h b/source/blender/editors/space_outliner/outliner_intern.h
index 70aec25ab40..dcc81ad5f9d 100644
--- a/source/blender/editors/space_outliner/outliner_intern.h
+++ b/source/blender/editors/space_outliner/outliner_intern.h
@@ -37,5 +37,9 @@ struct wmWindowManager;
 void outliner_operatortypes(void);
 void outliner_keymap(struct wmWindowManager *wm);
 
+/* outliner_header.c */
+void outliner_header_buttons(const bContext *C, ARegion *ar);
+
+
 #endif /* ED_OUTLINER_INTERN_H */
 
diff --git a/source/blender/editors/space_outliner/space_outliner.c b/source/blender/editors/space_outliner/space_outliner.c
index ecc25d473d8..d7c70def0f3 100644
--- a/source/blender/editors/space_outliner/space_outliner.c
+++ b/source/blender/editors/space_outliner/space_outliner.c
@@ -460,6 +460,8 @@ static void outliner_header_area_draw(const bContext *C, ARegion *ar)
 	glClearColor(col[0], col[1], col[2], 0.0);
 	glClear(GL_COLOR_BUFFER_BIT);
 
+	outliner_header_buttons(C, ar);
+	
 	width= ar->winrct.xmax - ar->winrct.xmin;
 	height= ar->winrct.ymax - ar->winrct.ymin;
 
@@ -468,7 +470,7 @@ static void outliner_header_area_draw(const bContext *C, ARegion *ar)
 
 	glColor3f(1.0f, 1.0f, 1.0f);
 	UI_SetScale(1.0);
-	UI_RasterPos(0.5f*(width - (bbox.xmax - bbox.xmin)), 0.5f*(height - (bbox.ymax - bbox.ymin)));
+	UI_RasterPos(50 + 0.5f*(width - (bbox.xmax - bbox.xmin)), 0.5f*(height - (bbox.ymax - bbox.ymin)));
 	UI_DrawString(UI_HELV, path, 0);
 }
 
diff --git a/source/blender/editors/space_time/space_time.c b/source/blender/editors/space_time/space_time.c
index 1dec774aa55..d6faefa856b 100644
--- a/source/blender/editors/space_time/space_time.c
+++ b/source/blender/editors/space_time/space_time.c
@@ -230,16 +230,16 @@ static SpaceLink *time_new(void)
 	ar->v2d.tot.xmax= (float)EFRA + 4.0;
 	ar->v2d.tot.ymax= 10;
 
-	stime->v2d.cur= stime->v2d.tot;
+	ar->v2d.cur= ar->v2d.tot;
 
-	stime->v2d.min[0]= 1.0;
-	//stime->v2d.min[1]= (float)stime->winy;
+	ar->v2d.min[0]= 1.0;
+	ar->v2d.min[1]= 500.0; /* XXX */
 
-	stime->v2d.max[0]= 32000.0;
-	//stime->v2d.max[1]= (float)stime->winy;
+	ar->v2d.max[0]= 32000.0;
+	ar->v2d.max[1]= 500;   /* XXX */
 
-	stime->v2d.minzoom= 0.1f;
-	stime->v2d.maxzoom= 10.0;
+	ar->v2d.minzoom= 0.1f;
+	ar->v2d.maxzoom= 10.0;
 
 	ar->v2d.scroll |= (V2D_SCROLL_BOTTOM|V2D_SCROLL_SCALE_BOTTOM);
 	ar->v2d.align |= V2D_ALIGN_NO_NEG_Y;