diff options
| author | Joshua Leung <aligorith@gmail.com> | 2014-05-04 11:28:14 +0400 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2014-05-04 11:28:14 +0400 |
| commit | be7b09ef85d7d08d7c2b53cca474c338657f4478 (patch) | |
| tree | 0a4787813d1ecca1b12836c9e461043630e30023 /source/blender/editors/space_nla | |
| parent | 2812e6a069f71676ac87fc9328b611aee9467c35 (diff) | |
NLA Editor: Display "tweaking action" status indicator icon in place of action-type icon
Instead of displaying the "tweaking action" status indicator icon on the right hand
side jammed against the mapping/no-mapping toggle (pin), this is now displayed as in
place of the action icon used on the left (as the type indicator). This is less messy
than the previous situation, which was needed partly due to the abuse of an unsuited
icon.
Diffstat (limited to 'source/blender/editors/space_nla')
| -rw-r--r-- | source/blender/editors/space_nla/nla_draw.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/source/blender/editors/space_nla/nla_draw.c b/source/blender/editors/space_nla/nla_draw.c index a76612b0e53..2e12ca65e18 100644 --- a/source/blender/editors/space_nla/nla_draw.c +++ b/source/blender/editors/space_nla/nla_draw.c @@ -652,7 +652,11 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View group = 5; - special = ICON_ACTION; + /* indicate tweaking-action state by changing the icon... */ + if ((adt) && (adt->flag & ADT_NLA_EDIT_ON)) + special = ICON_ACTION_TWEAK; + else + special = ICON_ACTION; BLI_strncpy(name, act ? act->id.name + 2 : "<No Action>", sizeof(name)); @@ -782,13 +786,6 @@ static void draw_nla_channel_list_gl(bAnimContext *ac, ListBase *anim_data, View UI_icon_draw((float)(v2d->cur.xmax - offset), ydatac, ICON_PINNED); else UI_icon_draw((float)(v2d->cur.xmax - offset), ydatac, ICON_UNPINNED); - - fdrawline((float)(v2d->cur.xmax - offset), yminc, - (float)(v2d->cur.xmax - offset), ymaxc); - offset += 0.8f * U.widget_unit; - - /* 'tweaking action' indicator - not a button */ - UI_icon_draw((float)(v2d->cur.xmax - offset), ydatac, ICON_ACTION_TWEAK); } else { /* XXX firstly draw a little rect to help identify that it's different from the toggles */ |