[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37202] trunk/blender/source/blender: with the new scalable UI.

[Campbell Barton]

Revision: 37202
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37202
Author:   campbellbarton
Date:     2011-06-05 09:00:36 +0000 (Sun, 05 Jun 2011)
Log Message:
-----------
with the new scalable UI. hard coded values were still used for resizing the 
headers, with DPI of 56 the headers could not be un-hidden.

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

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c   2011-06-05 
08:18:37 UTC (rev 37201)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c   2011-06-05 
09:00:36 UTC (rev 37202)
@@ -6280,7 +6280,7 @@
        
        BLI_addtail(lb, ar);
        ar->regiontype= RGN_TYPE_HEADER;
-       if(sa->headertype==1)
+       if(sa->headertype==HEADERDOWN)
                ar->alignment= RGN_ALIGN_BOTTOM;
        else
                ar->alignment= RGN_ALIGN_TOP;

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c    2011-06-05 
08:18:37 UTC (rev 37201)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c    2011-06-05 
09:00:36 UTC (rev 37202)
@@ -1631,7 +1631,7 @@
                                rmd->ar->sizex= rmd->origval + delta;
                                CLAMP(rmd->ar->sizex, 0, rmd->maxsize);
                                
-                               if(rmd->ar->sizex < 24) {
+                               if(rmd->ar->sizex < UI_UNIT_X) {
                                        rmd->ar->sizex= rmd->origval;
                                        if(!(rmd->ar->flag & RGN_FLAG_HIDDEN))
                                                ED_region_toggle_hidden(C, 
rmd->ar);
@@ -1646,11 +1646,17 @@
                                
                                rmd->ar->sizey= rmd->origval + delta;
                                CLAMP(rmd->ar->sizey, 0, rmd->maxsize);
-                               
-                               if(rmd->ar->regiontype == RGN_TYPE_TOOL_PROPS)
-                                       maxsize = rmd->maxsize - 
((rmd->sa->headertype==2)?48:24) - 10;
 
-                               if(rmd->ar->sizey < 24 || (maxsize > 0 && 
(rmd->ar->sizey > maxsize)) ) {
+                               if(rmd->ar->regiontype == RGN_TYPE_TOOL_PROPS) {
+                                       /* this calculation seems overly verbose
+                                        * can someone explain why this method 
is necessary? - campbell */
+                                       maxsize = rmd->maxsize - 
((rmd->sa->headertype==HEADERTOP)?UI_UNIT_Y*2:UI_UNIT_Y) - (UI_UNIT_Y/4);
+                               }
+
+                               /* 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)) ) {
                                        rmd->ar->sizey= rmd->origval;
                                        if(!(rmd->ar->flag & RGN_FLAG_HIDDEN))
                                                ED_region_toggle_hidden(C, 
rmd->ar);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs