diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2010-09-18 03:50:10 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2010-09-18 03:50:10 +0400 |
| commit | 6d9e4c719aad137453ede0ed04f93445b38ae702 (patch) | |
| tree | cbcdde3a7c42db9868aca85d81242ccff9c07912 | |
| parent | a06c46d8dd552a651c90f0ca9805bfbba04cb193 (diff) | |
Apply patch [#23745] fix #23078 operator panel disappears.
Patch by Shane Ambler
Reported by Anthony Edlin
From the patch details:
"
In response to bug #23078 the operator panel disappears when dragged above the top of the 3dview without showing the
azone icon to restore it.
This patch properly hides the operator panel if dragged near the top of the 3dview so that the azone icon is in place
"
Thanks!
| -rw-r--r-- | source/blender/editors/screen/screen_ops.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c index ffe61b3e4d6..0c92d6bbc6a 100644 --- a/source/blender/editors/screen/screen_ops.c +++ b/source/blender/editors/screen/screen_ops.c @@ -1415,13 +1415,17 @@ static int region_scale_modal(bContext *C, wmOperator *op, wmEvent *event) ED_region_toggle_hidden(C, rmd->ar); } else { + int maxsize=0; delta= event->y - rmd->origy; if(rmd->edge=='b') delta= -delta; rmd->ar->sizey= rmd->origval + delta; CLAMP(rmd->ar->sizey, 0, rmd->maxsize); - if(rmd->ar->sizey < 24) { + 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)) ) { rmd->ar->sizey= rmd->origval; if(!(rmd->ar->flag & RGN_FLAG_HIDDEN)) ED_region_toggle_hidden(C, rmd->ar); |