From d5f2b7e496da02c53c12e7fb5f16152ad1558174 Mon Sep 17 00:00:00 2001 From: gxalpha Date: Sat, 19 Feb 2022 15:39:00 +0100 Subject: [PATCH] UI: Refresh edit menu on item select/deselect --- UI/source-tree.cpp | 2 ++ UI/window-basic-main.cpp | 8 +------- UI/window-basic-main.hpp | 2 -- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/UI/source-tree.cpp b/UI/source-tree.cpp index 4ae014d1d..8a1175bc4 100644 --- a/UI/source-tree.cpp +++ b/UI/source-tree.cpp @@ -623,12 +623,14 @@ void SourceTreeItem::Select() { tree->SelectItem(sceneitem, true); OBSBasic::Get()->UpdateContextBarDeferred(); + OBSBasic::Get()->UpdateEditMenu(); } void SourceTreeItem::Deselect() { tree->SelectItem(sceneitem, false); OBSBasic::Get()->UpdateContextBarDeferred(); + OBSBasic::Get()->UpdateEditMenu(); } /* ========================================================================= */ diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index fa172ce5e..1cadc9052 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -1842,6 +1842,7 @@ void OBSBasic::OBSInit() ui->contextContainer->setVisible(contextVisible); if (contextVisible) UpdateContextBar(true); + UpdateEditMenu(); { ProfileScope("OBSBasic::Load"); @@ -5369,8 +5370,6 @@ ColorSelect::ColorSelect(QWidget *parent) void OBSBasic::CreateSourcePopupMenu(int idx, bool preview) { - UpdateEditMenu(); - QMenu popup(this); delete previewProjectorSource; delete sourceProjector; @@ -7825,11 +7824,6 @@ void OBSBasic::UpdateEditMenu() ui->actionHorizontalCenter->setEnabled(canTransform); } -void OBSBasic::on_menuBasic_MainMenu_Edit_aboutToShow() -{ - UpdateEditMenu(); -} - void OBSBasic::on_actionEditTransform_triggered() { if (transformWindow) diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp index 565314bcb..9e54ef891 100644 --- a/UI/window-basic-main.hpp +++ b/UI/window-basic-main.hpp @@ -966,8 +966,6 @@ private slots: void on_actionShowCrashLogs_triggered(); void on_actionUploadLastCrashLog_triggered(); - void on_menuBasic_MainMenu_Edit_aboutToShow(); - void on_actionEditTransform_triggered(); void on_actionCopyTransform_triggered(); void on_actionPasteTransform_triggered();