diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-01-03 15:04:05 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-01-03 15:04:05 +0300 |
| commit | 832f2d33d318ed9169ba49ad083e5c15da5f0d35 (patch) | |
| tree | 499af259cdd9ac88929c081036067f254dcc28a7 /source/blender/src/interface.c | |
| parent | 4bc4eac1e5c15d45a25b3586ea637a1e035f5e1e (diff) | |
Orange; stuff for the animation department!
- Found the potential crasher for sound playback & undo. Test!
- PoseMode: NKey panel didn't work when actions where assigned
- NLA: "Add action strip" now displays in menu to which active object the
actions are added.
Diffstat (limited to 'source/blender/src/interface.c')
| -rw-r--r-- | source/blender/src/interface.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/src/interface.c b/source/blender/src/interface.c index d3379f37593..3fd015ec500 100644 --- a/source/blender/src/interface.c +++ b/source/blender/src/interface.c @@ -6010,8 +6010,12 @@ short pupmenu_col(char *instr, int maxrow) while (rows*columns<(md->nitems+columns) ) rows++; /* size and location */ - if(md->title) width= 2*strlen(md->title)+BIF_GetStringWidth(uiBlockGetCurFont(block), md->title, (U.transopts & USER_TR_BUTTONS)); + if(md->title) { + width= 2*strlen(md->title)+BIF_GetStringWidth(uiBlockGetCurFont(block), md->title, (U.transopts & USER_TR_BUTTONS)); + width /= columns; + } else width= 0; + for(a=0; a<md->nitems; a++) { xmax= BIF_GetStringWidth(uiBlockGetCurFont(block), md->items[a].str, (U.transopts & USER_TR_BUTTONS)); if(xmax>width) width= xmax; @@ -6086,7 +6090,7 @@ short pupmenu_col(char *instr, int maxrow) if(md->title) { uiBut *bt; uiSetCurFont(block, UI_HELVB); - bt= uiDefBut(block, LABEL, 0, md->title, startx, (short)(starty+rows*boxh), (short)width, (short)boxh, NULL, 0.0, 0.0, 0, 0, ""); + bt= uiDefBut(block, LABEL, 0, md->title, startx, (short)(starty+rows*boxh), columns*(short)width, (short)boxh, NULL, 0.0, 0.0, 0, 0, ""); uiSetCurFont(block, UI_HELV); bt->flag= UI_TEXT_LEFT; } |