From da04907927bab03c158176717dfef6f3fed5cbdd Mon Sep 17 00:00:00 2001 From: jp9000 Date: Sun, 3 Oct 2021 07:52:44 -0700 Subject: [PATCH] Revert "UI: Disable hotkeys when a user is expected to type text" This reverts commit f832d14220b572165bf69ad73f30a5b961d02258. Reverting this until we do more investigation. Currently, any text that can be typed in a dialog requires the dialog to re-enable hotkeys on destruction, which is frustrating. There has to be a better way. --- UI/source-tree.cpp | 2 -- UI/window-basic-filters.cpp | 2 -- UI/window-basic-interaction.cpp | 2 -- UI/window-basic-main.cpp | 7 ------- UI/window-basic-properties.cpp | 3 --- UI/window-basic-source-select.cpp | 4 ---- UI/window-namedialog.cpp | 4 ---- 7 files changed, 24 deletions(-) diff --git a/UI/source-tree.cpp b/UI/source-tree.cpp index f2f5bfdc4..3d46582b3 100644 --- a/UI/source-tree.cpp +++ b/UI/source-tree.cpp @@ -376,7 +376,6 @@ void SourceTreeItem::EnterEditMode() editor->installEventFilter(this); boxLayout->insertWidget(index, editor); setFocusProxy(editor); - App()->DisableHotkeys(); } void SourceTreeItem::ExitEditMode(bool save) @@ -416,7 +415,6 @@ void SourceTreeItem::ExitEditModeInternal(bool save) setFocusPolicy(Qt::NoFocus); boxLayout->insertWidget(index, label); label->setFocus(); - App()->UpdateHotkeyFocusSetting(); /* ----------------------------------------- */ /* check for empty string */ diff --git a/UI/window-basic-filters.cpp b/UI/window-basic-filters.cpp index 0ce808b71..2e7c2f14a 100644 --- a/UI/window-basic-filters.cpp +++ b/UI/window-basic-filters.cpp @@ -936,7 +936,6 @@ void OBSBasicFilters::EditItem(QListWidgetItem *item, bool async) list->editItem(item); item->setFlags(flags); editActive = true; - App()->DisableHotkeys(); } void OBSBasicFilters::DuplicateItem(QListWidgetItem *item) @@ -1108,7 +1107,6 @@ void OBSBasicFilters::FilterNameEdited(QWidget *editor, QListWidget *list) listItem->setText(QString()); SetupVisibilityItem(list, listItem, filter); editActive = false; - App()->UpdateHotkeyFocusSetting(); } void OBSBasicFilters::AsyncFilterNameEdited( diff --git a/UI/window-basic-interaction.cpp b/UI/window-basic-interaction.cpp index dc3e09ed7..b2788259b 100644 --- a/UI/window-basic-interaction.cpp +++ b/UI/window-basic-interaction.cpp @@ -67,7 +67,6 @@ OBSBasicInteraction::OBSBasicInteraction(QWidget *parent, OBSSource source_) }; connect(ui->preview, &OBSQTDisplay::DisplayCreated, addDrawCallback); - App()->DisableHotkeys(); } OBSBasicInteraction::~OBSBasicInteraction() @@ -75,7 +74,6 @@ OBSBasicInteraction::~OBSBasicInteraction() // since QT fakes a mouse movement while destructing a widget // remove our event filter ui->preview->removeEventFilter(eventFilter.get()); - App()->UpdateHotkeyFocusSetting(); } OBSEventFilter *OBSBasicInteraction::BuildEventFilter() diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp index 373b67be7..eb412652d 100644 --- a/UI/window-basic-main.cpp +++ b/UI/window-basic-main.cpp @@ -4831,7 +4831,6 @@ void OBSBasic::on_scenes_currentItemChanged(QListWidgetItem *current, void OBSBasic::EditSceneName() { - App()->DisableHotkeys(); ui->scenesDock->removeAction(renameScene); QListWidgetItem *item = ui->scenes->currentItem(); Qt::ItemFlags flags = item->flags(); @@ -5065,9 +5064,7 @@ void OBSBasic::on_actionAddScene_triggered() void OBSBasic::on_actionRemoveScene_triggered() { - App()->DisableHotkeys(); RemoveSelectedScene(); - App()->UpdateHotkeyFocusSetting(); } void OBSBasic::ChangeSceneIndex(bool relative, int offset, int invalidIdx) @@ -5757,8 +5754,6 @@ void OBSBasic::on_actionRemoveSource_triggered() if (!confirmed) return; - App()->DisableHotkeys(); - /* ----------------------------------------------- */ /* save undo data */ @@ -5789,7 +5784,6 @@ void OBSBasic::on_actionRemoveSource_triggered() } CreateSceneUndoRedoAction(action_name, undo_data, redo_data); - App()->UpdateHotkeyFocusSetting(); } void OBSBasic::on_actionInteract_triggered() @@ -6075,7 +6069,6 @@ static void RenameListItem(OBSBasic *parent, QListWidget *listWidget, void OBSBasic::SceneNameEdited(QWidget *editor, QAbstractItemDelegate::EndEditHint endHint) { - App()->UpdateHotkeyFocusSetting(); OBSScene scene = GetCurrentScene(); QLineEdit *edit = qobject_cast(editor); string text = QT_TO_UTF8(edit->text().trimmed()); diff --git a/UI/window-basic-properties.cpp b/UI/window-basic-properties.cpp index c5ce3a1af..4186cc56a 100644 --- a/UI/window-basic-properties.cpp +++ b/UI/window-basic-properties.cpp @@ -214,8 +214,6 @@ OBSBasicProperties::OBSBasicProperties(QWidget *parent, OBSSource source_) } else { preview->hide(); } - - App()->DisableHotkeys(); } OBSBasicProperties::~OBSBasicProperties() @@ -226,7 +224,6 @@ OBSBasicProperties::~OBSBasicProperties() obs_source_dec_showing(source); main->SaveProject(); main->UpdateContextBar(); - App()->UpdateHotkeyFocusSetting(); } void OBSBasicProperties::AddPreviewButton() diff --git a/UI/window-basic-source-select.cpp b/UI/window-basic-source-select.cpp index 9d377e0cd..4d3db5d61 100644 --- a/UI/window-basic-source-select.cpp +++ b/UI/window-basic-source-select.cpp @@ -297,13 +297,11 @@ void OBSBasicSourceSelect::on_buttonBox_accepted() obs_sceneitem_release(item); } - App()->UpdateHotkeyFocusSetting(); done(DialogCode::Accepted); } void OBSBasicSourceSelect::on_buttonBox_rejected() { - App()->UpdateHotkeyFocusSetting(); done(DialogCode::Rejected); } @@ -378,8 +376,6 @@ OBSBasicSourceSelect::OBSBasicSourceSelect(OBSBasic *parent, const char *id_, } else { obs_enum_sources(EnumSources, this); } - - App()->DisableHotkeys(); } void OBSBasicSourceSelect::SourcePaste(const char *name, bool visible, bool dup) diff --git a/UI/window-namedialog.cpp b/UI/window-namedialog.cpp index db8a89613..a9d69d340 100644 --- a/UI/window-namedialog.cpp +++ b/UI/window-namedialog.cpp @@ -67,7 +67,6 @@ bool NameDialog::AskForName(QWidget *parent, const QString &title, const QString &text, std::string &userTextInput, const QString &placeHolder, int maxSize) { - App()->DisableHotkeys(); if (maxSize <= 0 || maxSize > 32767) maxSize = 170; @@ -85,7 +84,6 @@ bool NameDialog::AskForName(QWidget *parent, const QString &title, } userTextInput = dialog.userText->text().toUtf8().constData(); CleanWhitespace(userTextInput); - App()->UpdateHotkeyFocusSetting(); return true; } @@ -96,7 +94,6 @@ bool NameDialog::AskForNameWithOption(QWidget *parent, const QString &title, bool &optionChecked, const QString &placeHolder) { - App()->DisableHotkeys(); NameDialog dialog(parent); dialog.setWindowTitle(title); @@ -113,6 +110,5 @@ bool NameDialog::AskForNameWithOption(QWidget *parent, const QString &title, userTextInput = dialog.userText->text().toUtf8().constData(); CleanWhitespace(userTextInput); optionChecked = dialog.checkbox->isChecked(); - App()->UpdateHotkeyFocusSetting(); return true; }