diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-20 21:18:48 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-05-20 21:18:48 +0400 |
| commit | 3cc2d61689cddf59010a366e075275b7daa4ee58 (patch) | |
| tree | 30e4309b78584ec6998b4b3ea56f13023d263b66 /source/blender | |
| parent | 3e495458912ced0420120d7b291f88edf8e7d823 (diff) | |
UI:
* Hide enable button in horizontal collapsed panels.
* Fix enable button not being in correct position when zooming.
* Fix n-key panels layout being messed up.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/interface/interface_layout.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_panel.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/screen/area.c | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index c1877ac8861..56183bfb314 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -1346,7 +1346,7 @@ static void ui_litem_layout_free(uiLayout *litem) scaley= (float)litem->h/(float)toth; x= litem->x; - y= litem->y - scalex*toth; + y= litem->y - scaley*toth; for(item=litem->items.first; item; item=item->next) { ui_item_offset(item, &itemx, &itemy); diff --git a/source/blender/editors/interface/interface_panel.c b/source/blender/editors/interface/interface_panel.c index 5cb06845bdf..539f18c2cd8 100644 --- a/source/blender/editors/interface/interface_panel.c +++ b/source/blender/editors/interface/interface_panel.c @@ -451,10 +451,8 @@ static void ui_draw_aligned_panel_header(ARegion *ar, uiStyle *style, uiBlock *b nr++; /* + 0.001f to avoid flirting with float inaccuracy */ - if(panel->control & UI_PNL_CLOSE) pnl_icons=(2*PNL_ICON+5)/block->aspect + 0.001f; - else pnl_icons= (PNL_ICON+5)/block->aspect + 0.001f; - - pnl_icons += panel->labelofs; + if(panel->control & UI_PNL_CLOSE) pnl_icons=(panel->labelofs+2*PNL_ICON+5)/block->aspect + 0.001f; + else pnl_icons= (panel->labelofs+PNL_ICON+5)/block->aspect + 0.001f; if(nr==1) { diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 2e551a26b73..cf72eaf2cdd 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1004,7 +1004,7 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, char *contex if(vertical) y -= header; - if(pt->draw_header) { + if(pt->draw_header && (open || vertical)) { /* for enabled buttons */ panel->layout= uiBlockLayout(block, UI_LAYOUT_HORIZONTAL, UI_LAYOUT_HEADER, triangle, header+style->panelspace, header, 1, style); |