UI: Fix spacer lines not using accessibility color
The spacer helper lines would not use the selection color set in the accessibility settings.master
parent
0c930f52d3
commit
2b4629848d
|
@ -629,7 +629,6 @@ private:
|
||||||
QColor cropColor;
|
QColor cropColor;
|
||||||
QColor hoverColor;
|
QColor hoverColor;
|
||||||
|
|
||||||
QColor GetSelectionColor() const;
|
|
||||||
QColor GetCropColor() const;
|
QColor GetCropColor() const;
|
||||||
QColor GetHoverColor() const;
|
QColor GetHoverColor() const;
|
||||||
|
|
||||||
|
@ -981,6 +980,8 @@ public:
|
||||||
|
|
||||||
void SetDisplayAffinity(QWindow *window);
|
void SetDisplayAffinity(QWindow *window);
|
||||||
|
|
||||||
|
QColor GetSelectionColor() const;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
virtual void closeEvent(QCloseEvent *event) override;
|
virtual void closeEvent(QCloseEvent *event) override;
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||||
|
|
|
@ -2353,6 +2353,8 @@ static void DrawLabel(OBSSource source, vec3 &pos, vec3 &viewport)
|
||||||
static void DrawSpacingLine(vec3 &start, vec3 &end, vec3 &viewport,
|
static void DrawSpacingLine(vec3 &start, vec3 &end, vec3 &viewport,
|
||||||
float pixelRatio)
|
float pixelRatio)
|
||||||
{
|
{
|
||||||
|
OBSBasic *main = OBSBasic::Get();
|
||||||
|
|
||||||
matrix4 transform;
|
matrix4 transform;
|
||||||
matrix4_identity(&transform);
|
matrix4_identity(&transform);
|
||||||
transform.x.x = viewport.x;
|
transform.x.x = viewport.x;
|
||||||
|
@ -2361,8 +2363,11 @@ static void DrawSpacingLine(vec3 &start, vec3 &end, vec3 &viewport,
|
||||||
gs_effect_t *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
|
gs_effect_t *solid = obs_get_base_effect(OBS_EFFECT_SOLID);
|
||||||
gs_technique_t *tech = gs_effect_get_technique(solid, "Solid");
|
gs_technique_t *tech = gs_effect_get_technique(solid, "Solid");
|
||||||
|
|
||||||
|
QColor selColor = main->GetSelectionColor();
|
||||||
vec4 color;
|
vec4 color;
|
||||||
vec4_set(&color, 1.0f, 0.0f, 0.0f, 1.0f);
|
vec4_set(&color, selColor.redF(), selColor.greenF(), selColor.blueF(),
|
||||||
|
1.0f);
|
||||||
|
|
||||||
gs_effect_set_vec4(gs_effect_get_param_by_name(solid, "color"), &color);
|
gs_effect_set_vec4(gs_effect_get_param_by_name(solid, "color"), &color);
|
||||||
|
|
||||||
gs_technique_begin(tech);
|
gs_technique_begin(tech);
|
||||||
|
|
Loading…
Reference in New Issue