diff options
| author | Joshua Leung <aligorith@gmail.com> | 2009-11-23 12:47:56 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2009-11-23 12:47:56 +0300 |
| commit | c6dbbde16bdcfc46eba0c5a6bcd02c8d40c5f964 (patch) | |
| tree | 604d6d8420649b0d9342bcec59ac92441dd0d954 /source/blender/editors/screen | |
| parent | 7617736bd1a628d6ea2300378e191c02bb4f5ad0 (diff) | |
Various bugfixes:
* Tweaked the code for operator buttons so that only those operator buttons in the toolbar have their text left-aligned. This is done at layout-block level
* Silenced "file_init" print when opening the file browser
* Disabled animateability of the "active_shape_key_index" for Objects, since this property behaves in a very unpredictable manner, leading to problems with users trying to keyframe shapekey values and ending up keying the list.
* Remove some unnecessary RNA wrapping code
Diffstat (limited to 'source/blender/editors/screen')
| -rw-r--r-- | source/blender/editors/screen/area.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/source/blender/editors/screen/area.c b/source/blender/editors/screen/area.c index 0f22b3041fb..08a05f4646a 100644 --- a/source/blender/editors/screen/area.c +++ b/source/blender/editors/screen/area.c @@ -1272,7 +1272,15 @@ void ED_region_panels(const bContext *C, ARegion *ar, int vertical, char *contex } if(open) { - panel->layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, + short panelContext; + + /* panel context can either be toolbar region or normal panels region */ + if (ar->regiontype == RGN_TYPE_TOOLS) + panelContext= UI_LAYOUT_TOOLBAR; + else + panelContext= UI_LAYOUT_PANEL; + + panel->layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, panelContext, style->panelspace, 0, w-2*style->panelspace, em, style); pt->draw(C, panel); |