4aiman/obs-studio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "UI: Disable hotkeys when a user is expected to type text"

Browse source 
This reverts commit f832d14220.

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.
This commit is contained in:
jp9000 2021-10-03 07:52:44 -07:00
commit da04907927
7 changed files with 0 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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<QLineEdit *>(editor);
string text = QT_TO_UTF8(edit->text().trimmed());