From b80919f65f7b4399fe2a273b1744a131ca8ff9a2 Mon Sep 17 00:00:00 2001 From: jpark37 Date: Tue, 29 Dec 2020 19:51:50 -0800 Subject: [PATCH] libobs: Support color picker with alpha --- libobs/obs-properties.c | 11 +++++++++++ libobs/obs-properties.h | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/libobs/obs-properties.c b/libobs/obs-properties.c index d7758ac4a..0b3475512 100644 --- a/libobs/obs-properties.c +++ b/libobs/obs-properties.c @@ -438,6 +438,8 @@ static inline size_t get_property_size(enum obs_property_type type) return sizeof(struct frame_rate_data); case OBS_PROPERTY_GROUP: return sizeof(struct group_data); + case OBS_PROPERTY_COLOR_ALPHA: + return 0; } return 0; @@ -652,6 +654,15 @@ obs_property_t *obs_properties_add_color(obs_properties_t *props, return new_prop(props, name, desc, OBS_PROPERTY_COLOR); } +obs_property_t *obs_properties_add_color_alpha(obs_properties_t *props, + const char *name, + const char *desc) +{ + if (!props || has_prop(props, name)) + return NULL; + return new_prop(props, name, desc, OBS_PROPERTY_COLOR_ALPHA); +} + obs_property_t *obs_properties_add_button(obs_properties_t *props, const char *name, const char *text, obs_property_clicked_t callback) diff --git a/libobs/obs-properties.h b/libobs/obs-properties.h index 32e33b6e5..927901207 100644 --- a/libobs/obs-properties.h +++ b/libobs/obs-properties.h @@ -56,6 +56,7 @@ enum obs_property_type { OBS_PROPERTY_EDITABLE_LIST, OBS_PROPERTY_FRAME_RATE, OBS_PROPERTY_GROUP, + OBS_PROPERTY_COLOR_ALPHA, }; enum obs_combo_format { @@ -224,6 +225,10 @@ EXPORT obs_property_t *obs_properties_add_color(obs_properties_t *props, const char *name, const char *description); +EXPORT obs_property_t *obs_properties_add_color_alpha(obs_properties_t *props, + const char *name, + const char *description); + EXPORT obs_property_t * obs_properties_add_button(obs_properties_t *props, const char *name, const char *text, obs_property_clicked_t callback);