mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

UI: Fix transition A/B labels on macOS/Linux

Browse Source 
Previously, if the video size in OBS was too big, the labels would not
render on macOS/Linux due to the labels not fitting inside the texture
in the freetype plugin. This change makes it so that there is a maximum
size for the label, rather than being solely based on video size.

This change also makes the labels look centered on macOS/Linux, as
unlike the GDI plugin on Windows, the freetype plugin aligns the bottom
of the text with the bottom of the source.
This commit is contained in:
VodBox 2019-06-01 23:59:35 +00:00
parent 6272409c49
commit d2bbe36e64
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
UI/window-basic-properties.cpp
View File

@ -261,7 +261,7 @@ static obs_source_t *CreateLabel(const char *name, size_t h)
obs_data_set_string(font, "face", "Monospace");
#endif
obs_data_set_int(font, "flags", 1); // Bold text
obs_data_set_int(font, "size", int(h));
obs_data_set_int(font, "size", min(int(h), 300));
obs_data_set_obj(settings, "font", font);
obs_data_set_string(settings, "text", text.c_str());
@ -300,7 +300,11 @@ static void CreateTransitionScene(OBSSource scene, char *text, uint32_t color)
vec2 size;
vec2_set(&size, obs_source_get_width(scene),
#ifdef _WIN32
obs_source_get_height(scene));
#else
obs_source_get_height(scene) * 0.8);
#endif
obs_sceneitem_set_bounds(item, &size);
obs_sceneitem_set_bounds_type(item, OBS_BOUNDS_SCALE_INNER);