mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-01-25 22:58:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

UI: Update Edit menu item states before displaying

Browse Source 
Originally, the states of the items in the Edit menu would only update
when a context menu popup was created for sources. This moves that code
out of the context menu creation, and into its own dedicated function.
That function is then used both before the Edit menu is shown, and
before the context menu is created.

Fixes obsproject/obs-studio#3827
This commit is contained in:
Mike
2020-12-05 00:48:54 +08:00
committed by Jim
parent 23cda97a54
commit 96449877ef
2 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5277,6 +5277,8 @@ ColorSelect::ColorSelect(QWidget *parent)
void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
{
UpdateEditMenu();
QMenu popup(this);
delete previewProjectorSource;
delete sourceProjector;
@@ -5321,9 +5323,6 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
if (addSourceMenu)
popup.addMenu(addSourceMenu);
ui->actionCopyFilters->setEnabled(false);
ui->actionCopySource->setEnabled(false);
if (ui->sources->MultipleBaseSelected()) {
popup.addSeparator();
popup.addAction(QTStr("Basic.Main.GroupItems"), ui->sources,
@@ -5351,7 +5350,6 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
popup.addSeparator();
OBSSceneItem sceneItem = ui->sources->Get(idx);
bool lock = obs_sceneitem_locked(sceneItem);
obs_source_t *source = obs_sceneitem_get_source(sceneItem);
uint32_t flags = obs_source_get_output_flags(source);
bool isAsyncVideo = (flags & OBS_SOURCE_ASYNC_VIDEO) ==
@@ -5370,19 +5368,8 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
SLOT(on_actionRemoveSource_triggered()));
popup.addSeparator();
popup.addMenu(ui->orderMenu);
popup.addMenu(ui->transformMenu);
ui->actionResetTransform->setEnabled(!lock);
ui->actionRotate90CW->setEnabled(!lock);
ui->actionRotate90CCW->setEnabled(!lock);
ui->actionRotate180->setEnabled(!lock);
ui->actionFlipHorizontal->setEnabled(!lock);
ui->actionFlipVertical->setEnabled(!lock);
ui->actionFitToScreen->setEnabled(!lock);
ui->actionStretchToScreen->setEnabled(!lock);
ui->actionCenterToScreen->setEnabled(!lock);
ui->actionVerticalCenter->setEnabled(!lock);
ui->actionHorizontalCenter->setEnabled(!lock);
popup.addMenu(ui->transformMenu);
sourceProjector = new QMenu(QTStr("SourceProjector"));
AddProjectorMenuMonitors(sourceProjector, this,
@@ -5446,12 +5433,7 @@ void OBSBasic::CreateSourcePopupMenu(int idx, bool preview)
popup.addAction(QTStr("Filters"), this, SLOT(OpenFilters()));
popup.addAction(QTStr("Properties"), this,
SLOT(on_actionSourceProperties_triggered()));
ui->actionCopyFilters->setEnabled(
obs_source_filter_count(source) > 0);
ui->actionCopySource->setEnabled(true);
}
ui->actionPasteFilters->setEnabled(copyFiltersString && idx != -1);
popup.exec(QCursor::pos());
}
@@ -7612,6 +7594,52 @@ config_t *OBSBasic::Config() const
return basicConfig;
}
void OBSBasic::UpdateEditMenu()
{
int idx = GetTopSelectedSourceItem();
size_t filter_count = 0;
OBSSceneItem sceneItem;
OBSSource source;
if (idx != -1) {
sceneItem = ui->sources->Get(idx);
source = obs_sceneitem_get_source(sceneItem);
filter_count = obs_source_filter_count(source);
}
ui->actionCopySource->setEnabled(idx != -1);
ui->actionEditTransform->setEnabled(idx != -1);
ui->actionCopyTransform->setEnabled(idx != -1);
ui->actionCopyFilters->setEnabled(filter_count > 0);
ui->actionPasteFilters->setEnabled(copyFiltersString && idx != -1);
ui->actionMoveUp->setEnabled(idx != -1);
ui->actionMoveDown->setEnabled(idx != -1);
ui->actionMoveToTop->setEnabled(idx != -1);
ui->actionMoveToBottom->setEnabled(idx != -1);
bool canTransform = false;
if (sceneItem)
canTransform = !obs_sceneitem_locked(sceneItem);
ui->actionResetTransform->setEnabled(canTransform);
ui->actionRotate90CW->setEnabled(canTransform);
ui->actionRotate90CCW->setEnabled(canTransform);
ui->actionRotate180->setEnabled(canTransform);
ui->actionFlipHorizontal->setEnabled(canTransform);
ui->actionFlipVertical->setEnabled(canTransform);
ui->actionFitToScreen->setEnabled(canTransform);
ui->actionStretchToScreen->setEnabled(canTransform);
ui->actionCenterToScreen->setEnabled(canTransform);
ui->actionVerticalCenter->setEnabled(canTransform);
ui->actionHorizontalCenter->setEnabled(canTransform);
}
void OBSBasic::on_menuBasic_MainMenu_Edit_aboutToShow()
{
UpdateEditMenu();
}
void OBSBasic::on_actionEditTransform_triggered()
{
if (transformWindow)