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

UI: Fix grayed out Copy option in sources context menu 

This fixes a problem introduced in #1050 where the Copy option would
be grayed out when rightclicking a source above the currently selected
source. This also retains the functionality of not having the Copy option
enabled when no source is selected.
master
Michel 2018-01-31 21:01:46 +01:00
parent c87597f7d6
commit 70fdd17287
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
UI/forms/OBSBasic.ui
View File

@ -182,10 +182,7 @@
<addaction name="actionScaleCanvas"/>
<addaction name="actionScaleOutput"/>
</widget>
<action name="actionCopySource">
<property name="enabled">
<bool>false</bool>
</property>
<action name="actionCopySource">
<property name="text">
<string>Copy</string>
</property>

5
UI/window-basic-main.cpp
View File

@ -2858,8 +2858,6 @@ void OBSBasic::SceneItemSelected(void *data, calldata_t *params)
QMetaObject::invokeMethod(window, "SelectSceneItem",
Q_ARG(OBSScene, scene), Q_ARG(OBSSceneItem, item),
Q_ARG(bool, true));
window->ui->actionCopySource->setEnabled(true);
}
void OBSBasic::SceneItemDeselected(void *data, calldata_t *params)
@ -2873,7 +2871,6 @@ void OBSBasic::SceneItemDeselected(void *data, calldata_t *params)
Q_ARG(OBSScene, scene), Q_ARG(OBSSceneItem, item),
Q_ARG(bool, false));
window->ui->actionCopySource->setEnabled(false);
}
void OBSBasic::SourceLoaded(void *data, obs_source_t *source)
@ -3891,6 +3888,7 @@ void OBSBasic::CreateSourcePopupMenu(QListWidgetItem *item, bool preview)
popup.addMenu(addSourceMenu);
ui->actionCopyFilters->setEnabled(false);
ui->actionCopySource->setEnabled(false);
popup.addSeparator();
popup.addAction(ui->actionCopySource);
@ -3969,6 +3967,7 @@ void OBSBasic::CreateSourcePopupMenu(QListWidgetItem *item, bool preview)
SLOT(on_actionSourceProperties_triggered()));
ui->actionCopyFilters->setEnabled(true);
ui->actionCopySource->setEnabled(true);
}
popup.exec(QCursor::pos());