diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-02 05:39:33 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-04-02 05:39:33 +0400 |
| commit | 4bb41c3dcdd029db63435e83700520070703a9bc (patch) | |
| tree | 1253f9881b1a4853778fa52d3207c56cefeeed8b /source/blender/editors/space_buttons | |
| parent | ecdd332021dcafdec69525a5140c1f43e1dc434a (diff) | |
UI: various panels fixes.
* Fix sometimes non-working close/open button.
* Fix panels being a bit out of the view on startup.
* Fix too large totrct region for view2d.
* Fix wrong panel order when changing vertical <-> horizontal.
* Fix wrong panel positions after switching contexts.
* Fix an access of freed memory when collapsing panels.
* Free align mode works again.
* Animations work again.
Diffstat (limited to 'source/blender/editors/space_buttons')
| -rw-r--r-- | source/blender/editors/space_buttons/buttons_header.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_buttons/space_buttons.c | 10 |
2 files changed, 1 insertions, 13 deletions
diff --git a/source/blender/editors/space_buttons/buttons_header.c b/source/blender/editors/space_buttons/buttons_header.c index 40e3564e69b..29374d7cb32 100644 --- a/source/blender/editors/space_buttons/buttons_header.c +++ b/source/blender/editors/space_buttons/buttons_header.c @@ -70,10 +70,8 @@ static void do_viewmenu(bContext *C, void *arg, int event) case 1: case 2: sbuts->align= event; - if(event) { + if(sbuts->align) sbuts->re_align= 1; - // uiAlignPanelStep(sa, 1.0); - } break; } diff --git a/source/blender/editors/space_buttons/space_buttons.c b/source/blender/editors/space_buttons/space_buttons.c index 61946744196..e514b51e29c 100644 --- a/source/blender/editors/space_buttons/space_buttons.c +++ b/source/blender/editors/space_buttons/space_buttons.c @@ -176,7 +176,6 @@ static void buttons_main_area_draw(const bContext *C, ARegion *ar) else { View2D *v2d= &ar->v2d; float col[3], fac; - //int align= 0; /* clear and setup matrix */ UI_GetThemeColor3fv(TH_BACK, col); @@ -193,15 +192,6 @@ static void buttons_main_area_draw(const bContext *C, ARegion *ar) /* panels */ drawnewstuff(); -#if 0 - if(sbuts->align) - if(sbuts->re_align || sbuts->mainbo!=sbuts->mainb || sbuts->tabo!=sbuts->tab[sbuts->mainb]) - align= 1; -#endif - - uiDrawPanels(C, 1); // XXX align); - uiMatchPanelsView2d(ar); - /* reset view matrix */ UI_view2d_view_restore(C); |