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

Fix an issue with properties view

Browse Source 
If a control changed the properties layout, it would lose focus on the
control.  Also, fiddled with the sizing policy a bit, because it wasn't
expanding when I used it in other windows.
This commit is contained in:
jp9000 2014-04-24 01:43:54 -07:00
parent 9edde0b892
commit 21db94656e
2 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
obs/properties-view.cpp
View File

@ -22,7 +22,8 @@ void OBSPropertiesView::RefreshProperties()
QFormLayout *layout = new QFormLayout;
widget->setLayout(layout);
QSizePolicy policy(QSizePolicy::Expanding, QSizePolicy::Preferred);
QSizePolicy mainPolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
QSizePolicy policy(QSizePolicy::Preferred, QSizePolicy::Preferred);
widget->setSizePolicy(policy);
layout->setSizeConstraint(QLayout::SetMaximumSize);
layout->setLabelAlignment(Qt::AlignRight);
@ -35,19 +36,28 @@ void OBSPropertiesView::RefreshProperties()
}
setWidget(widget);
setSizePolicy(policy);
setSizePolicy(mainPolicy);
lastFocused.clear();
if (lastWidget) {
lastWidget->setFocus(Qt::OtherFocusReason);
lastWidget = nullptr;
}
}
OBSPropertiesView::OBSPropertiesView(OBSData settings_,
obs_properties_t properties_, void *obj_,
PropertiesUpdateCallback callback_)
PropertiesUpdateCallback callback_, int minSize_)
: QScrollArea (nullptr),
widget (nullptr),
properties (properties_),
settings (settings_),
obj (obj_),
callback (callback_)
callback (callback_),
minSize (minSize_),
lastWidget (nullptr)
{
setFrameShape(QFrame::NoFrame);
RefreshProperties();
}
@ -198,7 +208,8 @@ QWidget *OBSPropertiesView::AddList(obs_property_t prop)
void OBSPropertiesView::AddProperty(obs_property_t property,
QFormLayout *layout)
{
obs_property_type type = obs_property_get_type(property);
const char *name = obs_property_name(property);
obs_property_type type = obs_property_get_type(property);
if (!obs_property_visible(property))
return;
@ -241,7 +252,16 @@ void OBSPropertiesView::AddProperty(obs_property_t property,
if (type != OBS_PROPERTY_BOOL)
label = new QLabel(QT_UTF8(obs_property_description(property)));
if (label && minSize) {
label->setMinimumWidth(minSize);
label->setAlignment(Qt::AlignRight | Qt::AlignVCenter);
}
layout->addRow(label, widget);
if (!lastFocused.empty())
if (lastFocused.compare(name) == 0)
lastWidget = widget;
}
void WidgetInfo::BoolChanged(const char *setting)
@ -333,6 +353,9 @@ void WidgetInfo::ControlChanged()
}
view->callback(view->obj, view->settings);
if (obs_property_modified(property, view->settings))
view->RefreshProperties();
if (obs_property_modified(property, view->settings)) {
view->lastFocused = setting;
QMetaObject::invokeMethod(view, "RefreshProperties",
Qt::QueuedConnection);
}
}

11
obs/properties-view.hpp
View File

@ -51,9 +51,10 @@ private:
OBSData settings;
void *obj;
PropertiesUpdateCallback callback;
int minSize;
std::vector<std::unique_ptr<WidgetInfo>> children;
void RefreshProperties();
std::string lastFocused;
QWidget *lastWidget;
QWidget *NewWidget(obs_property_t prop, QWidget *widget,
const char *signal);
@ -67,10 +68,14 @@ private:
void AddProperty(obs_property_t property, QFormLayout *layout);
public slots:
void RefreshProperties();
public:
OBSPropertiesView(OBSData settings,
obs_properties_t properties,
void *obj, PropertiesUpdateCallback callback);
void *obj, PropertiesUpdateCallback callback,
int minSize = 0);
inline ~OBSPropertiesView()
{