[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [19643] branches/blender2.5/blender/source /blender/editors/interface: 2.5

[Ton Roosendaal]

Revision: 19643
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19643
Author:   ton
Date:     2009-04-10 19:39:37 +0200 (Fri, 10 Apr 2009)

Log Message:
-----------
2.5

Quick hack to enable zoom in buttons window again.
It uses bad old conventions for fixed panel width still, view2d has
to be tweaked for new system. But, it shows layout to work. :)

Modified Paths:
--------------
    branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c
    branches/blender2.5/blender/source/blender/editors/interface/view2d.c

Modified: branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c	2009-04-10 16:45:19 UTC (rev 19642)
+++ branches/blender2.5/blender/source/blender/editors/interface/interface_layout.c	2009-04-10 17:39:37 UTC (rev 19643)
@@ -941,7 +941,7 @@
 			block= uiBeginBlock(C, ar, pt->idname, UI_EMBOSS, UI_HELV);
 			
 			if(vertical)
-				w= (ar->type->minsizex)? ar->type->minsizex-12: ar->winx-12;
+				w= (ar->type->minsizex)? ar->type->minsizex-12: block->aspect*ar->winx-12;
 			else
 				w= (ar->type->minsizex)? ar->type->minsizex-12: UI_PANEL_WIDTH-12;
 

Modified: branches/blender2.5/blender/source/blender/editors/interface/view2d.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/interface/view2d.c	2009-04-10 16:45:19 UTC (rev 19642)
+++ branches/blender2.5/blender/source/blender/editors/interface/view2d.c	2009-04-10 17:39:37 UTC (rev 19643)
@@ -155,6 +155,23 @@
 {
 	short tot_changed= 0;
 	
+	/* XXX always set state vars for buttonsview, this is hardcoded */
+	switch (type) {
+			/* panels view, with free/horizontal/vertical align */
+		case V2D_COMMONVIEW_PANELS_UI:
+		{
+			/* for now, aspect ratio should be maintained, and zoom is clamped within sane default limits */
+			v2d->keepzoom= (V2D_KEEPASPECT|V2D_KEEPZOOM);
+			v2d->minzoom= 0.5f;
+			v2d->maxzoom= 2.0f;
+			
+			v2d->align= (V2D_ALIGN_NO_NEG_X|V2D_ALIGN_NO_POS_Y);
+			v2d->keeptot= V2D_KEEPTOT_BOUNDS;
+		}
+			break;
+	}
+	
+	
 	/* initialise data if there is a need for such */
 	if ((v2d->flag & V2D_IS_INITIALISED) == 0) {
 		/* set initialised flag so that View2D doesn't get reinitialised next time again */
@@ -257,12 +274,12 @@
 			case V2D_COMMONVIEW_PANELS_UI:
 			{
 				/* for now, aspect ratio should be maintained, and zoom is clamped within sane default limits */
-				v2d->keepzoom= (V2D_LOCKZOOM_X|V2D_LOCKZOOM_Y|V2D_KEEPASPECT|V2D_KEEPZOOM);
+				v2d->keepzoom= (V2D_KEEPASPECT|V2D_KEEPZOOM);
 				v2d->minzoom= 0.5f;
 				v2d->maxzoom= 2.0f;
 				
 				v2d->align= (V2D_ALIGN_NO_NEG_X|V2D_ALIGN_NO_POS_Y);
-				v2d->keeptot= V2D_KEEPTOT_STRICT;
+				v2d->keeptot= V2D_KEEPTOT_BOUNDS;
 				
 				v2d->tot.xmin= 0.0f;
 				v2d->tot.xmax= winx;