diff options
| author | Joshua Leung <aligorith@gmail.com> | 2008-01-18 03:04:19 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2008-01-18 03:04:19 +0300 |
| commit | 14f007adc8273876d57737e38c37d4d4779b50cd (patch) | |
| tree | b9814644c8aaad41022d47f8633377a125346cd4 /source | |
| parent | 0db1666b6e178d9d4fe948f591666c5d094a8213 (diff) | |
== Action-Groups - Drawing Tweak ==
Now action-group channels are drawn with a green-ish strip background instead of the usual colours to help distinguish them from other channels, making it easier to identify them.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/src/drawaction.c | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/source/blender/src/drawaction.c b/source/blender/src/drawaction.c index b25473989be..2b280864f1c 100644 --- a/source/blender/src/drawaction.c +++ b/source/blender/src/drawaction.c @@ -695,9 +695,12 @@ static void draw_channel_strips(void) float y, sta, end; int act_start, act_end, dummy; char col1[3], col2[3]; + char col1a[3], col2a[3]; BIF_GetThemeColor3ubv(TH_SHADE2, col2); BIF_GetThemeColor3ubv(TH_HILITE, col1); + BIF_GetThemeColor3ubv(TH_GROUP, col2a); + BIF_GetThemeColor3ubv(TH_GROUP_ACTIVE, col1a); /* get editor data */ data= get_action_context(&datatype); @@ -766,12 +769,24 @@ static void draw_channel_strips(void) if (datatype == ACTCONT_ACTION) { gla2DDrawTranslatePt(di, G.v2d->cur.xmin, y, &frame1_x, &channel_y); - if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22); - else glColor4ub(col2[0], col2[1], col2[2], 0x22); + if (ale->datatype == ALE_GROUP) { + if (sel) glColor4ub(col1a[0], col1a[1], col1a[2], 0x22); + else glColor4ub(col2a[0], col2a[1], col2a[2], 0x22); + } + else { + if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22); + else glColor4ub(col2[0], col2[1], col2[2], 0x22); + } glRectf(frame1_x, channel_y-CHANNELHEIGHT/2, G.v2d->hor.xmax, channel_y+CHANNELHEIGHT/2); - if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22); - else glColor4ub(col2[0], col2[1], col2[2], 0x22); + if (ale->datatype == ALE_GROUP) { + if (sel) glColor4ub(col1a[0], col1a[1], col1a[2], 0x22); + else glColor4ub(col2a[0], col2a[1], col2a[2], 0x22); + } + else { + if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22); + else glColor4ub(col2[0], col2[1], col2[2], 0x22); + } glRectf(act_start, channel_y-CHANNELHEIGHT/2, act_end, channel_y+CHANNELHEIGHT/2); } else if (datatype == ACTCONT_SHAPEKEY) { |