diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-23 17:53:21 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-12-23 17:53:21 +0400 |
commit | 217a7d1829a36343792ef4114e5e032b22bac8af (patch) | |
tree | 6773715f2ce5ed6d5bbaaef496f6e9d1767406c0 /source | |
parent | 0f283e53937459931752b101f0d85e077a4ac756 (diff) |
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.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/editors/screen/screen_ops.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index 7e17592f67c..ffdfea7fde5 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1742,11 +1742,13 @@ static int region_scale_modal(bContext *C, wmOperator *op, wmEvent *event) /* 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); } |