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

[blender.git] / source / blender / editors / space_graph / graph_draw.c

diff --git a/source/blender/editors/space_graph/graph_draw.c b/source/blender/editors/space_graph/graph_draw.c
index 3ac90200aea1158f9595c69133d142f5f2599a48..b837e5164222d5598f166b9716a5e6c8424d1cfa 100644 (file)
--- a/source/blender/editors/space_graph/graph_draw.c
+++ b/source/blender/editors/space_graph/graph_draw.c
@@ -1130,18 +1130,18 @@ void graph_draw_channel_names(bContext *C, bAnimContext *ac, ARegion *ar)
         *      - offset of ACHANNEL_HEIGHT*2 is added to the height of the channels, as first is for 
         *        start of list offset, and the second is as a correction for the scrollers.
         */
         *      - offset of ACHANNEL_HEIGHT*2 is added to the height of the channels, as first is for 
         *        start of list offset, and the second is as a correction for the scrollers.
         */

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

        UI_view2d_totRect_set(v2d, ar->winx, height);
        
        /* loop through channels, and set up drawing depending on their type  */
        {   /* first pass: just the standard GL-drawing for backdrop + text */
                size_t channel_index = 0;
                
        UI_view2d_totRect_set(v2d, ar->winx, height);
        
        /* loop through channels, and set up drawing depending on their type  */
        {   /* 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, i = 0; ale; ale = ale->next, i++) {
                
                for (ale = anim_data.first, i = 0; ale; ale = ale->next, i++) {

-                       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) ||


@@ -1152,7 +1152,7 @@ void graph_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++;
                }
        }


@@ -1160,15 +1160,15 @@ void graph_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);

                
                /* set blending again, as may not be set in previous step */
                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                glEnable(GL_BLEND);
                
                for (ale = anim_data.first, i = 0; ale; ale = ale->next, i++) {
                
                /* set blending again, as may not be set in previous step */
                glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
                glEnable(GL_BLEND);
                
                for (ale = anim_data.first, i = 0; ale; ale = ale->next, i++) {

-                       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) ||


@@ -1179,7 +1179,7 @@ void graph_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++;
                }