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

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

diff --git a/source/blender/editors/space_action/action_draw.c b/source/blender/editors/space_action/action_draw.c
index 10748c2fe15f8873c18328c335a1a1dab393328a..9fc96e06299b7962a1538ded0d5086e9cdbf4a31 100644 (file)
--- a/source/blender/editors/space_action/action_draw.c
+++ b/source/blender/editors/space_action/action_draw.c
@@ -81,7 +81,7 @@ void draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
        filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        

-       height = ((items * ACHANNEL_STEP) + (ACHANNEL_HEIGHT));
+       height = ((items * ACHANNEL_STEP(ac)) + (ACHANNEL_HEIGHT(ac)));

        if (height > BLI_rcti_size_y(&v2d->mask)) {
                /* don't use totrect set, as the width stays the same 
                 * (NOTE: this is ok here, the configuration is pretty straightforward) 
        if (height > BLI_rcti_size_y(&v2d->mask)) {
                /* don't use totrect set, as the width stays the same 
                 * (NOTE: this is ok here, the configuration is pretty straightforward) 


@@ -95,11 +95,11 @@ void draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
        {   /* first pass: just the standard GL-drawing for backdrop + text */
                size_t channel_index = 0;
                
        {   /* first pass: just the standard GL-drawing for backdrop + text */
                size_t channel_index = 0;
                

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

                
                for (ale = anim_data.first; ale; ale = ale->next) {
                
                for (ale = anim_data.first; ale; ale = ale->next) {

-                       float yminc = (float)(y - ACHANNEL_HEIGHT_HALF);
-                       float ymaxc = (float)(y + ACHANNEL_HEIGHT_HALF);
+                       float yminc = (float)(y - ACHANNEL_HEIGHT_HALF(ac));
+                       float ymaxc = (float)(y + ACHANNEL_HEIGHT_HALF(ac));

                        
                        /* check if visible */
                        if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
                        
                        /* check if visible */
                        if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||


@@ -110,7 +110,7 @@ void draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
                        }
                        
                        /* adjust y-position for next one */
                        }
                        
                        /* adjust y-position for next one */

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

                        channel_index++;
                }
        }
                        channel_index++;
                }
        }


@@ -118,11 +118,11 @@ void draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
                uiBlock *block = UI_block_begin(C, ar, __func__, UI_EMBOSS);
                size_t channel_index = 0;
                
                uiBlock *block = UI_block_begin(C, ar, __func__, UI_EMBOSS);
                size_t channel_index = 0;
                

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

                
                for (ale = anim_data.first; ale; ale = ale->next) {
                
                for (ale = anim_data.first; ale; ale = ale->next) {

-                       float yminc = (float)(y - ACHANNEL_HEIGHT_HALF);
-                       float ymaxc = (float)(y + ACHANNEL_HEIGHT_HALF);
+                       float yminc = (float)(y - ACHANNEL_HEIGHT_HALF(ac));
+                       float ymaxc = (float)(y + ACHANNEL_HEIGHT_HALF(ac));

                        
                        /* check if visible */
                        if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
                        
                        /* check if visible */
                        if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||


@@ -133,7 +133,7 @@ void draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
                        }
                        
                        /* adjust y-position for next one */
                        }
                        
                        /* adjust y-position for next one */

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

                        channel_index++;
                }
                
                        channel_index++;
                }
                


@@ -195,19 +195,19 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
        filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        
        filter = (ANIMFILTER_DATA_VISIBLE | ANIMFILTER_LIST_VISIBLE | ANIMFILTER_LIST_CHANNELS);
        items = ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
        

-       height = ((items * ACHANNEL_STEP) + (ACHANNEL_HEIGHT));
+       height = ((items * ACHANNEL_STEP(ac)) + (ACHANNEL_HEIGHT(ac)));

        /* don't use totrect set, as the width stays the same 
         * (NOTE: this is ok here, the configuration is pretty straightforward) 
         */
        v2d->tot.ymin = (float)(-height);
        
        /* first backdrop strips */
        /* don't use totrect set, as the width stays the same 
         * (NOTE: this is ok here, the configuration is pretty straightforward) 
         */
        v2d->tot.ymin = (float)(-height);
        
        /* first backdrop strips */

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

        glEnable(GL_BLEND);
        
        for (ale = anim_data.first; ale; ale = ale->next) {
        glEnable(GL_BLEND);
        
        for (ale = anim_data.first; ale; ale = ale->next) {

-               const float yminc = (float)(y - ACHANNEL_HEIGHT_HALF);
-               const float ymaxc = (float)(y + ACHANNEL_HEIGHT_HALF);
+               const float yminc = (float)(y - ACHANNEL_HEIGHT_HALF(ac));
+               const float ymaxc = (float)(y + ACHANNEL_HEIGHT_HALF(ac));

                
                /* check if visible */
                if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
                
                /* check if visible */
                if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||


@@ -260,39 +260,39 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                        }
                                        
                                        /* draw region twice: firstly backdrop, then the current range */
                                        }
                                        
                                        /* draw region twice: firstly backdrop, then the current range */

-                                       glRectf(v2d->cur.xmin,  (float)y - ACHANNEL_HEIGHT_HALF,  v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF);
+                                       glRectf(v2d->cur.xmin,  (float)y - ACHANNEL_HEIGHT_HALF(ac),  v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF(ac));

                                        
                                        if (ac->datatype == ANIMCONT_ACTION)
                                        
                                        if (ac->datatype == ANIMCONT_ACTION)

-                                               glRectf(act_start,  (float)y - ACHANNEL_HEIGHT_HALF,  act_end,  (float)y + ACHANNEL_HEIGHT_HALF);
+                                               glRectf(act_start,  (float)y - ACHANNEL_HEIGHT_HALF(ac),  act_end,  (float)y + ACHANNEL_HEIGHT_HALF(ac));

                                }
                                else if (ac->datatype == ANIMCONT_GPENCIL) {
                                        /* frames less than one get less saturated background */
                                        if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
                                        else glColor4ub(col2[0], col2[1], col2[2], 0x22);
                                }
                                else if (ac->datatype == ANIMCONT_GPENCIL) {
                                        /* frames less than one get less saturated background */
                                        if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
                                        else glColor4ub(col2[0], col2[1], col2[2], 0x22);

-                                       glRectf(0.0f, (float)y - ACHANNEL_HEIGHT_HALF, v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF);
+                                       glRectf(0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac));

                                        
                                        /* frames one and higher get a saturated background */
                                        if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x44);
                                        else glColor4ub(col2[0], col2[1], col2[2], 0x44);
                                        
                                        /* frames one and higher get a saturated background */
                                        if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x44);
                                        else glColor4ub(col2[0], col2[1], col2[2], 0x44);

-                                       glRectf(v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF, v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF);
+                                       glRectf(v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF(ac));

                                }
                                else if (ac->datatype == ANIMCONT_MASK) {
                                        /* TODO --- this is a copy of gpencil */
                                        /* frames less than one get less saturated background */
                                        if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
                                        else glColor4ub(col2[0], col2[1], col2[2], 0x22);
                                }
                                else if (ac->datatype == ANIMCONT_MASK) {
                                        /* TODO --- this is a copy of gpencil */
                                        /* frames less than one get less saturated background */
                                        if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x22);
                                        else glColor4ub(col2[0], col2[1], col2[2], 0x22);

-                                       glRectf(0.0f, (float)y - ACHANNEL_HEIGHT_HALF, v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF);
+                                       glRectf(0.0f, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmin, (float)y + ACHANNEL_HEIGHT_HALF(ac));

 
                                        /* frames one and higher get a saturated background */
                                        if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x44);
                                        else glColor4ub(col2[0], col2[1], col2[2], 0x44);
 
                                        /* frames one and higher get a saturated background */
                                        if (sel) glColor4ub(col1[0], col1[1], col1[2], 0x44);
                                        else glColor4ub(col2[0], col2[1], col2[2], 0x44);

-                                       glRectf(v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF, v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF);
+                                       glRectf(v2d->cur.xmin, (float)y - ACHANNEL_HEIGHT_HALF(ac), v2d->cur.xmax + EXTRA_SCROLL_PAD,  (float)y + ACHANNEL_HEIGHT_HALF(ac));

                                }
                        }
                }
                
                /*      Increment the step */
                                }
                        }
                }
                
                /*      Increment the step */

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

        }
        glDisable(GL_BLEND);
        
        }
        glDisable(GL_BLEND);
        


@@ -301,11 +301,11 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
         *         This is to try to optimize this for heavier data sets
         *      2) Keyframes which are out of view horizontally are disregarded 
         */
         *         This is to try to optimize this for heavier data sets
         *      2) Keyframes which are out of view horizontally are disregarded 
         */

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

        
        for (ale = anim_data.first; ale; ale = ale->next) {
        
        for (ale = anim_data.first; ale; ale = ale->next) {

-               const float yminc = (float)(y - ACHANNEL_HEIGHT_HALF);
-               const float ymaxc = (float)(y + ACHANNEL_HEIGHT_HALF);
+               const float yminc = (float)(y - ACHANNEL_HEIGHT_HALF(ac));
+               const float ymaxc = (float)(y + ACHANNEL_HEIGHT_HALF(ac));

                
                /* check if visible */
                if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||
                
                /* check if visible */
                if (IN_RANGE(yminc, v2d->cur.ymin, v2d->cur.ymax) ||


@@ -318,34 +318,34 @@ void draw_channel_strips(bAnimContext *ac, SpaceAction *saction, ARegion *ar)
                                /* draw 'keyframes' for each specific datatype */
                                switch (ale->datatype) {
                                        case ALE_ALL:
                                /* draw 'keyframes' for each specific datatype */
                                switch (ale->datatype) {
                                        case ALE_ALL:

-                                               draw_summary_channel(v2d, ale->data, y);
+                                               draw_summary_channel(v2d, ale->data, y, ac->yscale_fac);

                                                break;
                                        case ALE_SCE:
                                                break;
                                        case ALE_SCE:

-                                               draw_scene_channel(v2d, ads, ale->key_data, y);
+                                               draw_scene_channel(v2d, ads, ale->key_data, y, ac->yscale_fac);

                                                break;
                                        case ALE_OB:
                                                break;
                                        case ALE_OB:

-                                               draw_object_channel(v2d, ads, ale->key_data, y);
+                                               draw_object_channel(v2d, ads, ale->key_data, y, ac->yscale_fac);

                                                break;
                                        case ALE_ACT:
                                                break;
                                        case ALE_ACT:

-                                               draw_action_channel(v2d, adt, ale->key_data, y);
+                                               draw_action_channel(v2d, adt, ale->key_data, y, ac->yscale_fac);

                                                break;
                                        case ALE_GROUP:
                                                break;
                                        case ALE_GROUP:

-                                               draw_agroup_channel(v2d, adt, ale->data, y);
+                                               draw_agroup_channel(v2d, adt, ale->data, y, ac->yscale_fac);

                                                break;
                                        case ALE_FCURVE:
                                                break;
                                        case ALE_FCURVE:

-                                               draw_fcurve_channel(v2d, adt, ale->key_data, y);
+                                               draw_fcurve_channel(v2d, adt, ale->key_data, y, ac->yscale_fac);

                                                break;
                                        case ALE_GPFRAME:
                                                break;
                                        case ALE_GPFRAME:

-                                               draw_gpl_channel(v2d, ads, ale->data, y);
+                                               draw_gpl_channel(v2d, ads, ale->data, y, ac->yscale_fac);

                                                break;
                                        case ALE_MASKLAY:
                                                break;
                                        case ALE_MASKLAY:

-                                               draw_masklay_channel(v2d, ads, ale->data, y);
+                                               draw_masklay_channel(v2d, ads, ale->data, y, ac->yscale_fac);

                                                break;
                                }
                        }
                }
                
                                                break;
                                }
                        }
                }
                

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

        }
        
        /* free tempolary channels used for drawing */
        }
        
        /* free tempolary channels used for drawing */