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

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

diff --git a/source/blender/editors/space_action/action_select.c b/source/blender/editors/space_action/action_select.c
index 7900217e28eaabb844bc0ddf048615b390a28fe6..5a4b2fe300529ff0cb1441f0d718de708e75301f 100644 (file)
--- a/source/blender/editors/space_action/action_select.c
+++ b/source/blender/editors/space_action/action_select.c
@@ -213,7 +213,7 @@ static void borderselect_action(bAnimContext *ac, const rcti rect, short mode, s
        KeyframeEditFunc ok_cb, select_cb;
        View2D *v2d = &ac->ar->v2d;
        rctf rectf;
        KeyframeEditFunc ok_cb, select_cb;
        View2D *v2d = &ac->ar->v2d;
        rctf rectf;

-       float ymin = 0, ymax = (float)(-ACHANNEL_HEIGHT_HALF);
+       float ymin = 0, ymax = (float)(-ACHANNEL_HEIGHT_HALF(ac));

        
        /* convert mouse coordinates to frame ranges and channel coordinates corrected for view pan/zoom */
        UI_view2d_region_to_view(v2d, rect.xmin, rect.ymin + 2, &rectf.xmin, &rectf.ymin);
        
        /* convert mouse coordinates to frame ranges and channel coordinates corrected for view pan/zoom */
        UI_view2d_region_to_view(v2d, rect.xmin, rect.ymin + 2, &rectf.xmin, &rectf.ymin);


@@ -239,7 +239,7 @@ static void borderselect_action(bAnimContext *ac, const rcti rect, short mode, s
                AnimData *adt = ANIM_nla_mapping_get(ac, ale);
                
                /* get new vertical minimum extent of channel */
                AnimData *adt = ANIM_nla_mapping_get(ac, ale);
                
                /* get new vertical minimum extent of channel */

-               ymin = ymax - ACHANNEL_STEP;
+               ymin = ymax - ACHANNEL_STEP(ac);

                
                /* set horizontal range (if applicable) */
                if (ELEM(mode, ACTKEYS_BORDERSEL_FRAMERANGE, ACTKEYS_BORDERSEL_ALLKEYS)) {
                
                /* set horizontal range (if applicable) */
                if (ELEM(mode, ACTKEYS_BORDERSEL_FRAMERANGE, ACTKEYS_BORDERSEL_ALLKEYS)) {


@@ -392,7 +392,7 @@ static void region_select_action_keys(bAnimContext *ac, const rctf *rectf_view,
        KeyframeEditFunc ok_cb, select_cb;
        View2D *v2d = &ac->ar->v2d;
        rctf rectf, scaled_rectf;
        KeyframeEditFunc ok_cb, select_cb;
        View2D *v2d = &ac->ar->v2d;
        rctf rectf, scaled_rectf;

-       float ymin = 0, ymax = (float)(-ACHANNEL_HEIGHT_HALF);
+       float ymin = 0, ymax = (float)(-ACHANNEL_HEIGHT_HALF(ac));

        
        /* convert mouse coordinates to frame ranges and channel coordinates corrected for view pan/zoom */
        UI_view2d_region_to_view_rctf(v2d, rectf_view, &rectf);
        
        /* convert mouse coordinates to frame ranges and channel coordinates corrected for view pan/zoom */
        UI_view2d_region_to_view_rctf(v2d, rectf_view, &rectf);


@@ -426,10 +426,10 @@ static void region_select_action_keys(bAnimContext *ac, const rctf *rectf_view,
                AnimData *adt = ANIM_nla_mapping_get(ac, ale);
                
                /* get new vertical minimum extent of channel */
                AnimData *adt = ANIM_nla_mapping_get(ac, ale);
                
                /* get new vertical minimum extent of channel */

-               ymin = ymax - ACHANNEL_STEP;
+               ymin = ymax - ACHANNEL_STEP(ac);

                
                /* compute midpoint of channel (used for testing if the key is in the region or not) */
                
                /* compute midpoint of channel (used for testing if the key is in the region or not) */

-               ked.channel_y = ymin + ACHANNEL_HEIGHT_HALF;
+               ked.channel_y = ymin + ACHANNEL_HEIGHT_HALF(ac);

                
                /* if channel is mapped in NLA, apply correction
                 * - Apply to the bounds being checked, not all the keyframe points,
                
                /* if channel is mapped in NLA, apply correction
                 * - Apply to the bounds being checked, not all the keyframe points,


@@ -1360,7 +1360,7 @@ static void mouse_action_keys(bAnimContext *ac, const int mval[2], short select_
        
        /* use View2D to determine the index of the channel (i.e a row in the list) where keyframe was */
        UI_view2d_region_to_view(v2d, mval[0], mval[1], &x, &y);
        
        /* use View2D to determine the index of the channel (i.e a row in the list) where keyframe was */
        UI_view2d_region_to_view(v2d, mval[0], mval[1], &x, &y);

-       UI_view2d_listview_view_to_cell(v2d, 0, ACHANNEL_STEP, 0, (float)ACHANNEL_HEIGHT_HALF, x, y, NULL, &channel_index);
+       UI_view2d_listview_view_to_cell(v2d, 0, ACHANNEL_STEP(ac), 0, (float)ACHANNEL_HEIGHT_HALF(ac), x, y, NULL, &channel_index);

        
        /* x-range to check is +/- 7 (in screen/region-space) on either side of mouse click (size of keyframe icon) */
        UI_view2d_region_to_view(v2d, mval[0] - 7, mval[1], &rectf.xmin, &rectf.ymin);
        
        /* x-range to check is +/- 7 (in screen/region-space) on either side of mouse click (size of keyframe icon) */
        UI_view2d_region_to_view(v2d, mval[0] - 7, mval[1], &rectf.xmin, &rectf.ymin);