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

UI: Make multiview colors easier to manage

Browse Source
This commit is contained in:
Shaolin 2018-03-08 16:04:22 -03:00
parent a142261edd
commit fc3e85a598
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
UI/window-projector.cpp
View File

@ -435,9 +435,8 @@ void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy)
/* ----------- */
if (src == previewSrc || src == programSrc) {
uint32_t colorVal = src == programSrc
? 0xFFFF0000
: 0xFF00FF00;
uint32_t colorVal = src == programSrc ? programColor
: previewColor;
gs_matrix_push();
gs_matrix_translate3f(sourceX, sourceY, 0.0f);
@ -446,7 +445,7 @@ void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy)
gs_matrix_push();
gs_matrix_translate3f(qiX, qiY, 0.0f);
drawBox(qiCX, qiCY, 0xFF000000);
drawBox(qiCX, qiCY, backgroundColor);
gs_matrix_pop();
}
@ -460,7 +459,7 @@ void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy)
obs_source_video_render(src);
resetRegion();
gs_effect_set_color(color, 0xFFFFFFFF);
gs_effect_set_color(color, outerColor);
renderVB(solid, window->outerBox, targetCX, targetCY);
gs_matrix_pop();
@ -475,13 +474,13 @@ void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy)
gs_matrix_translate3f(sourceX + offset,
(quarterCY * 0.8f) + sourceY, 0.0f);
drawBox(cx, cy + int(quarterCX * 0.015f), 0xD91F1F1F);
drawBox(cx, cy + int(quarterCX * 0.015f), labelColor);
obs_source_video_render(label);
gs_matrix_pop();
}
gs_effect_set_color(color, 0xFFFFFFFF);
gs_effect_set_color(color, outerColor);
/* ----------------------------- */
/* draw preview */
@ -530,7 +529,7 @@ void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy)
gs_matrix_push();
gs_matrix_translate3f(labelX, labelY, 0.0f);
drawBox(cx, cy + int(halfCX * 0.015f), 0xD91F1F1F);
drawBox(cx, cy + int(halfCX * 0.015f), labelColor);
obs_source_video_render(previewLabel);
gs_matrix_pop();
@ -570,7 +569,7 @@ void OBSProjector::OBSRenderMultiview(void *data, uint32_t cx, uint32_t cy)
gs_matrix_push();
gs_matrix_translate3f(labelX, labelY, 0.0f);
drawBox(cx, cy + int(halfCX * 0.015f), 0xD91F1F1F);
drawBox(cx, cy + int(halfCX * 0.015f), labelColor);
obs_source_video_render(programLabel);
gs_matrix_pop();

7
UI/window-projector.hpp
View File

@ -49,6 +49,13 @@ private:
gs_vertbuffer_t *rightLine = nullptr;
bool ready = false;
// argb colors
static const uint32_t outerColor = 0xFFD0D0D0;
static const uint32_t labelColor = 0xD91F1F1F;
static const uint32_t backgroundColor = 0xFF000000;
static const uint32_t previewColor = 0xFF00FF00;
static const uint32_t programColor = 0xFFFF0000;
void UpdateMultiview();
void UpdateProjectorTitle(QString name);