OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: Fix Copy/Paste not including blend mode

Browse source
This commit is contained in:
jp9000 2021-12-28 09:12:51 -08:00
parent 2364dfd0ef
commit 213712dfe5
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
UI/window-basic-main.cpp
View file

@ -9064,6 +9064,7 @@ void OBSBasic::on_actionCopySource_triggered()
copyInfo.weak_source = OBSGetWeakRef(source);
obs_sceneitem_get_info(item, &copyInfo.transform);
obs_sceneitem_get_crop(item, &copyInfo.crop);
copyInfo.blend = obs_sceneitem_get_blending_mode(item);
copyInfo.visible = obs_sceneitem_visible(item);
clipboard.push_back(copyInfo);

1
UI/window-basic-main.hpp
View file

@ -94,6 +94,7 @@ struct SourceCopyInfo {
bool visible;
obs_sceneitem_crop crop;
obs_transform_info transform;
obs_blending_type blend;
};
struct QuickTransition {

21
UI/window-basic-source-select.cpp
View file

@ -26,6 +26,7 @@ struct AddSourceData {
bool visible;
obs_transform_info *transform = nullptr;
obs_sceneitem_crop *crop = nullptr;
obs_blending_type *blend = nullptr;
};
bool OBSBasicSourceSelect::EnumSources(void *data, obs_source_t *source)
@ -121,9 +122,10 @@ static void AddSource(void *_data, obs_scene_t *scene)
if (data->transform != nullptr)
obs_sceneitem_set_info(sceneitem, data->transform);
if (data->crop != nullptr)
obs_sceneitem_set_crop(sceneitem, data->crop);
if (data->blend != nullptr)
obs_sceneitem_set_blending_mode(sceneitem, *data->blend);
obs_sceneitem_set_visible(sceneitem, data->visible);
}
@ -148,7 +150,8 @@ static char *get_new_source_name(const char *name)
}
static void AddExisting(OBSSource source, bool visible, bool duplicate,
obs_transform_info *transform, obs_sceneitem_crop *crop)
obs_transform_info *transform, obs_sceneitem_crop *crop,
obs_blending_type *blend)
{
OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
OBSScene scene = main->GetCurrentScene();
@ -172,6 +175,7 @@ static void AddExisting(OBSSource source, bool visible, bool duplicate,
data.visible = visible;
data.transform = transform;
data.crop = crop;
data.blend = blend;
obs_enter_graphics();
obs_scene_atomic_update(scene, AddSource, &data);
@ -179,11 +183,13 @@ static void AddExisting(OBSSource source, bool visible, bool duplicate,
}
static void AddExisting(const char *name, bool visible, bool duplicate,
obs_transform_info *transform, obs_sceneitem_crop *crop)
obs_transform_info *transform, obs_sceneitem_crop *crop,
obs_blending_type *blend)
{
OBSSourceAutoRelease source = obs_get_source_by_name(name);
if (source) {
AddExisting(source.Get(), visible, duplicate, transform, crop);
AddExisting(source.Get(), visible, duplicate, transform, crop,
blend);
}
}
@ -243,7 +249,7 @@ void OBSBasicSourceSelect::on_buttonBox_accepted()
QString source_name = item->text();
AddExisting(QT_TO_UTF8(source_name), visible, false, nullptr,
nullptr);
nullptr, nullptr);
OBSBasic *main =
reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
@ -281,7 +287,7 @@ void OBSBasicSourceSelect::on_buttonBox_accepted()
main->SetCurrentScene(scene_source, true);
obs_source_release(scene_source);
AddExisting(QT_TO_UTF8(source_name), visible, false,
nullptr, nullptr);
nullptr, nullptr, nullptr);
};
undo_s.add_action(QTStr("Undo.Add").arg(source_name), undo,
@ -431,5 +437,6 @@ void OBSBasicSourceSelect::SourcePaste(SourceCopyInfo &info, bool dup)
if (!source)
return;
AddExisting(source, info.visible, dup, &info.transform, &info.crop);
AddExisting(source, info.visible, dup, &info.transform, &info.crop,
&info.blend);
}