diff options
| author | Ton Roosendaal <ton@blender.org> | 2009-07-07 21:30:39 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2009-07-07 21:30:39 +0400 |
| commit | d896ed98fef159e2f67364dcceab7011791618e6 (patch) | |
| tree | 85a825fe4bcfb4d99989004d0da9043adf0acf48 /source/blender/editors/interface/view2d.c | |
| parent | cfd5046c9e4a6617a20cfc7e59519a84d3c18b9d (diff) | |
2.5
- Scrollers now only disappear for regions with a fixed total view, like
lists, buttons, channels. More or less infinite views keep scrollers to
indicate that you can still pan or zoom further.
- Nodes: put back SHIFT+D "Add duplicate"
(Also fixed duplicate objects menu name... it should be a bit more
descriptive)
Diffstat (limited to 'source/blender/editors/interface/view2d.c')
| -rw-r--r-- | source/blender/editors/interface/view2d.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/source/blender/editors/interface/view2d.c b/source/blender/editors/interface/view2d.c index 11714df0491..fcac1987fdc 100644 --- a/source/blender/editors/interface/view2d.c +++ b/source/blender/editors/interface/view2d.c @@ -1279,8 +1279,10 @@ View2DScrollers *UI_view2d_scrollers_calc(const bContext *C, View2D *v2d, short if (scrollers->hor_min > scrollers->hor_max) scrollers->hor_min= scrollers->hor_max; - if(fac1 <= 0.0f && fac2 >= 1.0f) - scrollers->horfull= 1; + /* check whether sliders can disappear */ + if(v2d->keeptot) + if(fac1 <= 0.0f && fac2 >= 1.0f) + scrollers->horfull= 1; } /* vertical scrollers */ @@ -1304,8 +1306,10 @@ View2DScrollers *UI_view2d_scrollers_calc(const bContext *C, View2D *v2d, short if (scrollers->vert_min > scrollers->vert_max) scrollers->vert_min= scrollers->vert_max; - if(fac1 <= 0.0f && fac2 >= 1.0f) - scrollers->vertfull= 1; + /* check whether sliders can disappear */ + if(v2d->keeptot) + if(fac1 <= 0.0f && fac2 >= 1.0f) + scrollers->vertfull= 1; } /* grid markings on scrollbars */ |