Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Lendenfeld <chris.lend@gmx.at>2021-10-31 14:08:57 +0300
committerChristoph Lendenfeld <chris.lend@gmx.at>2021-10-31 14:08:57 +0300
commita06abbac92f2029269375ced69a2c4f75ecce5e1 (patch)
tree9799607c27051234d9bce3dc71421904a95540cd /source/blender/editors/util
parent945a99386b8c86ee45bac83329c98c9034a23ff7 (diff)
fix: pose slider consistent color
Change the way the pose slider gets its color so it is consistent between editors Previously the highlight color would be different between the 3D viewport and the graph editor. Reviewed by: Sybren A. Stüvel, Pablo Vazquez Differential Revision: https://developer.blender.org/D11878 Ref: D11878
Diffstat (limited to 'source/blender/editors/util')
-rw-r--r--source/blender/editors/util/ed_draw.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/editors/util/ed_draw.c b/source/blender/editors/util/ed_draw.c
index 2412939e859..721e32a3051 100644
--- a/source/blender/editors/util/ed_draw.c
+++ b/source/blender/editors/util/ed_draw.c
@@ -223,7 +223,7 @@ static void draw_main_line(const rctf *main_line_rect,
static void draw_backdrop(const int fontid,
const rctf *main_line_rect,
- const float color_bg[4],
+ const uint8_t color_bg[4],
const short region_y_size,
const float base_tick_height)
{
@@ -241,7 +241,7 @@ static void draw_backdrop(const int fontid,
.ymin = pad[1],
.ymax = region_y_size - pad[1],
};
- UI_draw_roundbox_aa(&backdrop_rect, true, 4.0f, color_bg);
+ UI_draw_roundbox_3ub_alpha(&backdrop_rect, true, 4.0f, color_bg, color_bg[3]);
}
/**
@@ -260,19 +260,19 @@ static void slider_draw(const struct bContext *UNUSED(C), ARegion *region, void
uint8_t color_line[4];
uint8_t color_handle[4];
uint8_t color_overshoot[4];
- float color_bg[4];
+ uint8_t color_bg[4];
/* Get theme colors. */
- UI_GetThemeColor4ubv(TH_TEXT, color_text);
- UI_GetThemeColor4ubv(TH_TEXT, color_line);
- UI_GetThemeColor4ubv(TH_TEXT, color_overshoot);
- UI_GetThemeColor4ubv(TH_ACTIVE, color_handle);
- UI_GetThemeColor3fv(TH_BACK, color_bg);
-
- color_bg[3] = 0.5f;
- color_overshoot[0] = color_overshoot[0] * 0.7;
- color_overshoot[1] = color_overshoot[1] * 0.7;
- color_overshoot[2] = color_overshoot[2] * 0.7;
+ UI_GetThemeColor4ubv(TH_HEADER_TEXT_HI, color_handle);
+ UI_GetThemeColor4ubv(TH_HEADER_TEXT, color_text);
+ UI_GetThemeColor4ubv(TH_HEADER_TEXT, color_line);
+ UI_GetThemeColor4ubv(TH_HEADER_TEXT, color_overshoot);
+ UI_GetThemeColor4ubv(TH_HEADER, color_bg);
+
+ color_overshoot[0] = color_overshoot[0] * 0.8;
+ color_overshoot[1] = color_overshoot[1] * 0.8;
+ color_overshoot[2] = color_overshoot[2] * 0.8;
+ color_bg[3] = 160;
/* Get the default font. */
const uiStyle *style = UI_style_get();