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

libobs: Support color picker with alpha

Browse Source
This commit is contained in:
jpark37 2020-12-29 19:51:50 -08:00 committed by Jim
parent 0d1ffd8b30
commit b80919f65f
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libobs/obs-properties.c
View File

@ -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)

5
libobs/obs-properties.h
View File

@ -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);