[Bf-blender-cvs] [45ad6cd5a78] master: UI: Pass color id into view2d text drawing
Jacques Lucke
noreply at git.blender.org
Fri May 3 15:12:23 CEST 2019
Commit: 45ad6cd5a785733612e0b355df7426154f262308
Author: Jacques Lucke
Date: Fri May 3 15:09:28 2019 +0200
Branches: master
https://developer.blender.org/rB45ad6cd5a785733612e0b355df7426154f262308
UI: Pass color id into view2d text drawing
===================================================================
M source/blender/editors/include/UI_view2d.h
M source/blender/editors/interface/view2d_draw.c
M source/blender/editors/space_action/space_action.c
M source/blender/editors/space_clip/space_clip.c
M source/blender/editors/space_graph/space_graph.c
M source/blender/editors/space_nla/space_nla.c
M source/blender/editors/space_sequencer/sequencer_draw.c
===================================================================
diff --git a/source/blender/editors/include/UI_view2d.h b/source/blender/editors/include/UI_view2d.h
index b1dfa89ae7d..064951d40ed 100644
--- a/source/blender/editors/include/UI_view2d.h
+++ b/source/blender/editors/include/UI_view2d.h
@@ -152,30 +152,24 @@ float UI_view2d_grid_resolution_y__values(const struct View2D *v2d);
/* scale indicator text drawing */
void UI_view2d_draw_scale_y__values(const struct ARegion *ar,
const struct View2D *v2d,
- const struct rcti *rect);
+ const struct rcti *rect,
+ int colorid);
void UI_view2d_draw_scale_y__block(const struct ARegion *ar,
const struct View2D *v2d,
- const struct rcti *rect);
-void UI_view2d_draw_scale_x__values(const struct ARegion *ar,
- const struct View2D *v2d,
- const struct rcti *rect);
-void UI_view2d_draw_scale_x__discrete_values(const struct ARegion *ar,
- const struct View2D *v2d,
- const struct rcti *rect);
-void UI_view2d_draw_scale_x__discrete_time(const struct ARegion *ar,
- const struct View2D *v2d,
- const struct rcti *rect,
- const struct Scene *scene);
+ const struct rcti *rect,
+ int colorid);
void UI_view2d_draw_scale_x__discrete_frames_or_seconds(const struct ARegion *ar,
const struct View2D *v2d,
const struct rcti *rect,
const struct Scene *scene,
- bool display_seconds);
+ bool display_seconds,
+ int colorid);
void UI_view2d_draw_scale_x__frames_or_seconds(const struct ARegion *ar,
const struct View2D *v2d,
const struct rcti *rect,
const struct Scene *scene,
- bool display_seconds);
+ bool display_seconds,
+ int colorid);
/* scrollbar drawing */
View2DScrollers *UI_view2d_scrollers_calc(struct View2D *v2d, const struct rcti *mask_custom);
diff --git a/source/blender/editors/interface/view2d_draw.c b/source/blender/editors/interface/view2d_draw.c
index 91128e49a60..96ad888274f 100644
--- a/source/blender/editors/interface/view2d_draw.c
+++ b/source/blender/editors/interface/view2d_draw.c
@@ -258,7 +258,8 @@ static void draw_horizontal_scale_indicators(const ARegion *ar,
float distance,
const rcti *rect,
PositionToString to_string,
- void *to_string_data)
+ void *to_string_data,
+ int colorid)
{
GPU_matrix_push_projection();
wmOrtho2_region_pixelspace(ar);
@@ -277,7 +278,7 @@ static void draw_horizontal_scale_indicators(const ARegion *ar,
}
const int font_id = BLF_default();
- UI_FontThemeColor(font_id, TH_TEXT);
+ UI_FontThemeColor(font_id, colorid);
BLF_batch_draw_begin();
@@ -308,7 +309,8 @@ static void draw_vertical_scale_indicators(const ARegion *ar,
float display_offset,
const rcti *rect,
PositionToString to_string,
- void *to_string_data)
+ void *to_string_data,
+ int colorid)
{
GPU_matrix_push_projection();
wmOrtho2_region_pixelspace(ar);
@@ -327,7 +329,7 @@ static void draw_vertical_scale_indicators(const ARegion *ar,
}
const int font_id = BLF_default();
- UI_FontThemeColor(font_id, TH_TEXT);
+ UI_FontThemeColor(font_id, colorid);
BLF_enable(font_id, BLF_ROTATION);
BLF_rotation(font_id, M_PI_2);
@@ -463,51 +465,62 @@ void UI_view2d_draw_lines_x__frames_or_seconds(const View2D *v2d,
/* Scale indicator text drawing API
**************************************************/
-void UI_view2d_draw_scale_x__discrete_values(const ARegion *ar,
- const View2D *v2d,
- const rcti *rect)
+static void UI_view2d_draw_scale_x__discrete_values(const ARegion *ar,
+ const View2D *v2d,
+ const rcti *rect,
+ int colorid)
{
float number_step = view2d_major_step_x__discrete(v2d);
- draw_horizontal_scale_indicators(ar, v2d, number_step, rect, view_to_string__frame_number, NULL);
+ draw_horizontal_scale_indicators(
+ ar, v2d, number_step, rect, view_to_string__frame_number, NULL, colorid);
}
-void UI_view2d_draw_scale_x__discrete_time(const ARegion *ar,
- const View2D *v2d,
- const rcti *rect,
- const Scene *scene)
+static void UI_view2d_draw_scale_x__discrete_time(
+ const ARegion *ar, const View2D *v2d, const rcti *rect, const Scene *scene, int colorid)
{
float step = view2d_major_step_x__time(v2d, scene);
- draw_horizontal_scale_indicators(ar, v2d, step, rect, view_to_string__time, (void *)scene);
+ draw_horizontal_scale_indicators(
+ ar, v2d, step, rect, view_to_string__time, (void *)scene, colorid);
}
-void UI_view2d_draw_scale_x__values(const ARegion *ar, const View2D *v2d, const rcti *rect)
+static void UI_view2d_draw_scale_x__values(const ARegion *ar,
+ const View2D *v2d,
+ const rcti *rect,
+ int colorid)
{
float step = view2d_major_step_x__continuous(v2d);
- draw_horizontal_scale_indicators(ar, v2d, step, rect, view_to_string__value, NULL);
+ draw_horizontal_scale_indicators(ar, v2d, step, rect, view_to_string__value, NULL, colorid);
}
-void UI_view2d_draw_scale_y__values(const ARegion *ar, const View2D *v2d, const rcti *rect)
+void UI_view2d_draw_scale_y__values(const ARegion *ar,
+ const View2D *v2d,
+ const rcti *rect,
+ int colorid)
{
float step = view2d_major_step_y__continuous(v2d);
- draw_vertical_scale_indicators(ar, v2d, step, 0.0f, rect, view_to_string__value, NULL);
+ draw_vertical_scale_indicators(ar, v2d, step, 0.0f, rect, view_to_string__value, NULL, colorid);
}
-void UI_view2d_draw_scale_y__block(const ARegion *ar, const View2D *v2d, const rcti *rect)
+void UI_view2d_draw_scale_y__block(const ARegion *ar,
+ const View2D *v2d,
+ const rcti *rect,
+ int colorid)
{
- draw_vertical_scale_indicators(ar, v2d, 1.0f, 0.5f, rect, view_to_string__value, NULL);
+ draw_vertical_scale_indicators(ar, v2d, 1.0f, 0.5f, rect, view_to_string__value, NULL, colorid);
}
void UI_view2d_draw_scale_x__discrete_frames_or_seconds(const struct ARegion *ar,
const struct View2D *v2d,
const struct rcti *rect,
const struct Scene *scene,
- bool display_seconds)
+ bool display_seconds,
+ int colorid)
{
if (display_seconds) {
- UI_view2d_draw_scale_x__discrete_time(ar, v2d, rect, scene);
+ UI_view2d_draw_scale_x__discrete_time(ar, v2d, rect, scene, colorid);
}
else {
- UI_view2d_draw_scale_x__discrete_values(ar, v2d, rect);
+ UI_view2d_draw_scale_x__discrete_values(ar, v2d, rect, colorid);
}
}
@@ -515,12 +528,13 @@ void UI_view2d_draw_scale_x__frames_or_seconds(const struct ARegion *ar,
const struct View2D *v2d,
const struct rcti *rect,
const struct Scene *scene,
- bool display_seconds)
+ bool display_seconds,
+ int colorid)
{
if (display_seconds) {
- UI_view2d_draw_scale_x__discrete_time(ar, v2d, rect, scene);
+ UI_view2d_draw_scale_x__discrete_time(ar, v2d, rect, scene, colorid);
}
else {
- UI_view2d_draw_scale_x__values(ar, v2d, rect);
+ UI_view2d_draw_scale_x__values(ar, v2d, rect, colorid);
}
}
diff --git a/source/blender/editors/space_action/space_action.c b/source/blender/editors/space_action/space_action.c
index 843abbd16db..5ac6297e108 100644
--- a/source/blender/editors/space_action/space_action.c
+++ b/source/blender/editors/space_action/space_action.c
@@ -241,7 +241,7 @@ static void action_main_region_draw(const bContext *C, ARegion *ar)
/* frame numbers */
UI_view2d_draw_scale_x__discrete_frames_or_seconds(
- ar, v2d, &v2d->hor, scene, saction->flag & SACTION_DRAWTIME);
+ ar, v2d, &v2d->hor, scene, saction->flag & SACTION_DRAWTIM
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list