jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Fix spacer lines not using accessibility color 

The spacer helper lines would not use the selection color set in the
accessibility settings.
master
cg2121 2022-08-03 21:28:02 -05:00 committed by Jim
parent 0c930f52d3
commit 2b4629848d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
UI/window-basic-main.hpp
View File

@ -629,7 +629,6 @@ private:
QColor cropColor;
QColor hoverColor;
QColor GetSelectionColor() const;
QColor GetCropColor() const;
QColor GetHoverColor() const;
@ -981,6 +980,8 @@ public:
void SetDisplayAffinity(QWindow *window);
QColor GetSelectionColor() const;
protected:
virtual void closeEvent(QCloseEvent *event) override;
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)

7
UI/window-basic-preview.cpp
View File

@ -2353,6 +2353,8 @@ static void DrawLabel(OBSSource source, vec3 &pos, vec3 &viewport)
static void DrawSpacingLine(vec3 &start, vec3 &end, vec3 &viewport,
float pixelRatio)
{
OBSBasic *main = OBSBasic::Get();
matrix4 transform;
matrix4_identity(&transform);
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_technique_t *tech = gs_effect_get_technique(solid, "Solid");
QColor selColor = main->GetSelectionColor();
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_technique_begin(tech);