diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-18 18:10:40 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2013-12-18 18:10:40 +0400 |
| commit | 81064447560cb1481b4094a4a5faa8cee2fe53a7 (patch) | |
| tree | a2e4991306181561cdb01306e17d01a9659d89e0 /source/blender/editors/interface/interface_panel.c | |
| parent | d591f314f9a3dc1a0d16b9061f63373ff611dc24 (diff) | |
Revert fix for T37705: it's messing up the panel order in another place.
Diffstat (limited to 'source/blender/editors/interface/interface_panel.c')
| -rw-r--r-- | source/blender/editors/interface/interface_panel.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 76d222f4bba..be6cbaf7b72 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -267,11 +267,6 @@ Panel *uiBeginPanel(ScrArea *sa, ARegion *ar, uiBlock *block, PanelType *pt, Pan } } - /* ensure panels without header are at the top */ - if (pt->flag & PNL_NO_HEADER) { - pa->sortorder = 0; - } - /* Do not allow closed panels without headers! Else user could get "disappeared" UI! */ if ((pt->flag & PNL_NO_HEADER) && (pa->flag & PNL_CLOSED)) { pa->flag &= ~PNL_CLOSED; @@ -290,16 +285,7 @@ Panel *uiBeginPanel(ScrArea *sa, ARegion *ar, uiBlock *block, PanelType *pt, Pan break; if (newpanel) { - if (palast) { - pa->sortorder = palast->sortorder + 1; - } - else { - pa->sortorder = 0; - - for (palast = ar->panels.first; palast; palast = palast->next) - if (pa->sortorder <= palast->sortorder) - pa->sortorder = palast->sortorder + 1; - } + pa->sortorder = (palast) ? palast->sortorder + 1 : 0; for (panext = ar->panels.first; panext; panext = panext->next) if (panext != pa && panext->sortorder >= pa->sortorder) @@ -1016,6 +1002,7 @@ void uiScalePanels(ARegion *ar, float new_width) for (block = ar->uiblocks.first; block; block = block->next) { if (block->panel) { float fac = new_width / (float)block->panel->sizex; + printf("scaled %f\n", fac); block->panel->sizex = new_width; for (but = block->buttons.first; but; but = but->next) { |