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

UI: Allow the transform dialog for group sub-sources

master
jp9000 2018-08-14 13:05:34 -07:00
parent fb58bcf75f
commit 7bc3c87163
1 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
UI/window-basic-transform.cpp
View File

@ -4,23 +4,28 @@
Q_DECLARE_METATYPE(OBSSceneItem);
static OBSSceneItem FindASelectedItem(OBSScene scene)
static bool find_sel(obs_scene_t *, obs_sceneitem_t *item, void *param)
{
auto func = [] (obs_scene_t *scene, obs_sceneitem_t *item, void *param)
{
OBSSceneItem &dst = *reinterpret_cast<OBSSceneItem*>(param);
OBSSceneItem &dst = *reinterpret_cast<OBSSceneItem*>(param);
if (obs_sceneitem_selected(item)) {
dst = item;
if (obs_sceneitem_selected(item)) {
dst = item;
return false;
}
if (obs_sceneitem_is_group(item)) {
obs_sceneitem_group_enum_items(item, find_sel, param);
if (!!dst) {
return false;
}
}
UNUSED_PARAMETER(scene);
return true;
};
return true;
};
static OBSSceneItem FindASelectedItem(OBSScene scene)
{
OBSSceneItem item;
obs_scene_enum_items(scene, func, &item);
obs_scene_enum_items(scene, find_sel, &item);
return item;
}
@ -63,9 +68,10 @@ OBSBasicTransform::OBSBasicTransform(OBSBasic *parent)
installEventFilter(CreateShortcutFilter());
OBSScene curScene = main->GetCurrentScene();
SetScene(curScene);
SetItem(FindASelectedItem(curScene));
OBSSceneItem item = FindASelectedItem(main->GetCurrentScene());
OBSScene scene = obs_sceneitem_get_scene(item);
SetScene(scene);
SetItem(item);
channelChangedSignal.Connect(obs_get_signal_handler(), "channel_change",
OBSChannelChanged, this);