提交 8a59d68e 编写于 作者: J jamacanbacn 提交者: jp9000

libobs: Fix property text typo

(This commit also modifies UI)

Closes jp9000/obs-studio#1204
上级 acf7d12b
...@@ -236,7 +236,7 @@ QWidget *OBSPropertiesView::AddText(obs_property_t *prop, QFormLayout *layout, ...@@ -236,7 +236,7 @@ QWidget *OBSPropertiesView::AddText(obs_property_t *prop, QFormLayout *layout,
{ {
const char *name = obs_property_name(prop); const char *name = obs_property_name(prop);
const char *val = obs_data_get_string(settings, name); const char *val = obs_data_get_string(settings, name);
obs_text_type type = obs_proprety_text_type(prop); obs_text_type type = obs_property_text_type(prop);
if (type == OBS_TEXT_MULTILINE) { if (type == OBS_TEXT_MULTILINE) {
QPlainTextEdit *edit = new QPlainTextEdit(QT_UTF8(val)); QPlainTextEdit *edit = new QPlainTextEdit(QT_UTF8(val));
...@@ -1529,7 +1529,7 @@ void WidgetInfo::FloatChanged(const char *setting) ...@@ -1529,7 +1529,7 @@ void WidgetInfo::FloatChanged(const char *setting)
void WidgetInfo::TextChanged(const char *setting) void WidgetInfo::TextChanged(const char *setting)
{ {
obs_text_type type = obs_proprety_text_type(property); obs_text_type type = obs_property_text_type(property);
if (type == OBS_TEXT_MULTILINE) { if (type == OBS_TEXT_MULTILINE) {
QPlainTextEdit *edit = static_cast<QPlainTextEdit*>(widget); QPlainTextEdit *edit = static_cast<QPlainTextEdit*>(widget);
......
...@@ -383,7 +383,7 @@ Property Enumeration Functions ...@@ -383,7 +383,7 @@ Property Enumeration Functions
--------------------- ---------------------
.. function:: enum obs_text_type obs_proprety_text_type(obs_property_t *p) .. function:: enum obs_text_type obs_property_text_type(obs_property_t *p)
--------------------- ---------------------
......
...@@ -738,7 +738,7 @@ enum obs_number_type obs_property_float_type(obs_property_t *p) ...@@ -738,7 +738,7 @@ enum obs_number_type obs_property_float_type(obs_property_t *p)
return data ? data->type : OBS_NUMBER_SCROLLER; return data ? data->type : OBS_NUMBER_SCROLLER;
} }
enum obs_text_type obs_proprety_text_type(obs_property_t *p) enum obs_text_type obs_property_text_type(obs_property_t *p)
{ {
struct text_data *data = get_type_data(p, OBS_PROPERTY_TEXT); struct text_data *data = get_type_data(p, OBS_PROPERTY_TEXT);
return data ? data->type : OBS_TEXT_DEFAULT; return data ? data->type : OBS_TEXT_DEFAULT;
...@@ -1107,3 +1107,8 @@ struct media_frames_per_second obs_property_frame_rate_fps_range_max( ...@@ -1107,3 +1107,8 @@ struct media_frames_per_second obs_property_frame_rate_fps_range_max(
data->ranges.array[idx].max_time : data->ranges.array[idx].max_time :
(struct media_frames_per_second){0}; (struct media_frames_per_second){0};
} }
enum obs_text_type obs_proprety_text_type(obs_property_t *p)
{
return obs_property_text_type(p);
}
...@@ -263,7 +263,7 @@ EXPORT double obs_property_float_min(obs_property_t *p); ...@@ -263,7 +263,7 @@ EXPORT double obs_property_float_min(obs_property_t *p);
EXPORT double obs_property_float_max(obs_property_t *p); EXPORT double obs_property_float_max(obs_property_t *p);
EXPORT double obs_property_float_step(obs_property_t *p); EXPORT double obs_property_float_step(obs_property_t *p);
EXPORT enum obs_number_type obs_property_float_type(obs_property_t *p); EXPORT enum obs_number_type obs_property_float_type(obs_property_t *p);
EXPORT enum obs_text_type obs_proprety_text_type(obs_property_t *p); EXPORT enum obs_text_type obs_property_text_type(obs_property_t *p);
EXPORT enum obs_path_type obs_property_path_type(obs_property_t *p); EXPORT enum obs_path_type obs_property_path_type(obs_property_t *p);
EXPORT const char * obs_property_path_filter(obs_property_t *p); EXPORT const char * obs_property_path_filter(obs_property_t *p);
EXPORT const char * obs_property_path_default_path(obs_property_t *p); EXPORT const char * obs_property_path_default_path(obs_property_t *p);
...@@ -336,6 +336,11 @@ EXPORT struct media_frames_per_second obs_property_frame_rate_fps_range_min( ...@@ -336,6 +336,11 @@ EXPORT struct media_frames_per_second obs_property_frame_rate_fps_range_min(
EXPORT struct media_frames_per_second obs_property_frame_rate_fps_range_max( EXPORT struct media_frames_per_second obs_property_frame_rate_fps_range_max(
obs_property_t *p, size_t idx); obs_property_t *p, size_t idx);
#ifndef SWIG
DEPRECATED
EXPORT enum obs_text_type obs_proprety_text_type(obs_property_t *p);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册