Dopesheet: Keyframe size can be adjusted as part of theme settings

[blender.git] / source / blender / editors / space_action / action_edit.c

diff --git a/source/blender/editors/space_action/action_edit.c b/source/blender/editors/space_action/action_edit.c
index 8261a211ed08e0d192e5deb346a0f72f5e8fd3e2..55b087c40e76d35e005c8bc30560f255396976eb 100644 (file)
--- a/source/blender/editors/space_action/action_edit.c
+++ b/source/blender/editors/space_action/action_edit.c
@@ -333,7 +333,7 @@ static bool actkeys_channels_get_selected_extents(bAnimContext *ac, float *min,
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through all channels, finding the first one that's selected */
        ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        /* loop through all channels, finding the first one that's selected */

-       y = (float)ACHANNEL_FIRST;
+       y = (float)ACHANNEL_FIRST(ac);

        
        for (ale = anim_data.first; ale; ale = ale->next) {
                const bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);
        
        for (ale = anim_data.first; ale; ale = ale->next) {
                const bAnimChannelType *acf = ANIM_channel_get_typeinfo(ale);


@@ -343,8 +343,8 @@ static bool actkeys_channels_get_selected_extents(bAnimContext *ac, float *min,
                    ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_SELECT))
                {
                        /* update best estimate */
                    ANIM_channel_setting_get(ac, ale, ACHANNEL_SETTING_SELECT))
                {
                        /* update best estimate */

-                       *min = (float)(y - ACHANNEL_HEIGHT_HALF);
-                       *max = (float)(y + ACHANNEL_HEIGHT_HALF);
+                       *min = (float)(y - ACHANNEL_HEIGHT_HALF(ac));
+                       *max = (float)(y + ACHANNEL_HEIGHT_HALF(ac));

                        
                        /* is this high enough priority yet? */
                        found = acf->channel_role;
                        
                        /* is this high enough priority yet? */
                        found = acf->channel_role;


@@ -358,7 +358,7 @@ static bool actkeys_channels_get_selected_extents(bAnimContext *ac, float *min,
                }
                
                /* adjust y-position for next one */
                }
                
                /* adjust y-position for next one */

-               y -= ACHANNEL_STEP;
+               y -= ACHANNEL_STEP(ac);

        }
        
        /* free all temp data */
        }
        
        /* free all temp data */