[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42846] trunk/blender/source/blender/ editors/screen/screen_ops.c: UI: small further tweak to last region expand/ collapse fix, when moving the

[Brecht Van Lommel]

Revision: 42846
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42846
Author:   blendix
Date:     2011-12-23 13:53:21 +0000 (Fri, 23 Dec 2011)
Log Message:
-----------
UI: small further tweak to last region expand/collapse fix, when moving the
operator redo panel up now it no longer hides the region, just stops it at
max size.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_ops.c

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2011-12-23 13:53:09 UTC (rev 42845)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2011-12-23 13:53:21 UTC (rev 42846)
@@ -1742,11 +1742,13 @@
 				/* note, 'UI_UNIT_Y/4' means you need to drag the header almost
 				 * all the way down for it to become hidden, this is done
 				 * otherwise its too easy to do this by accident */
-				if(rmd->ar->sizey < UI_UNIT_Y/4 || (maxsize > 0 && (rmd->ar->sizey > maxsize)) ) {
+				if(rmd->ar->sizey < UI_UNIT_Y/4) {
 					rmd->ar->sizey= rmd->origval;
 					if(!(rmd->ar->flag & RGN_FLAG_HIDDEN))
 						region_scale_toggle_hidden(C, rmd);
 				}
+				else if(maxsize > 0 && (rmd->ar->sizey > maxsize)) 
+					rmd->ar->sizey= maxsize;
 				else if(rmd->ar->flag & RGN_FLAG_HIDDEN)
 					region_scale_toggle_hidden(C, rmd);
 			}