Skip to content

UI: Add HotkeyBlocker class #9981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
cg2121 wants to merge 1 commit into from
Closed

UI: Add HotkeyBlocker class #9981

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions UI/context-bar-controls.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,7 @@ void ColorSourceToolbar::on_choose_clicked()
options |= QColorDialog::DontUseNativeDialog;
#endif

HotkeyBlocker hb;
QColor newColor = QColorDialog::getColor(color, this, desc, options);
if (!newColor.isValid()) {
return;
Expand Down Expand Up @@ -658,6 +659,7 @@ void TextSourceToolbar::on_selectFont_clicked()
options = QFontDialog::DontUseNativeDialog;
#endif

HotkeyBlocker hb;
font = QFontDialog::getFont(
&success, font, this,
QTStr("Basic.PropertiesWindow.SelectFont.WindowTitle"),
Expand Down Expand Up @@ -711,6 +713,7 @@ void TextSourceToolbar::on_selectColor_clicked()
options |= QColorDialog::DontUseNativeDialog;
#endif

HotkeyBlocker hb;
QColor newColor = QColorDialog::getColor(color, this, desc, options);
if (!newColor.isValid()) {
return;
Expand Down
6 changes: 6 additions & 0 deletions UI/obs-app.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,3 +295,9 @@ extern bool restart_safe;
extern "C" void install_dll_blocklist_hook(void);
extern "C" void log_blocked_dlls(void);
#endif

class HotkeyBlocker {
public:
inline HotkeyBlocker() { App()->DisableHotkeys(); }
inline ~HotkeyBlocker() { App()->UpdateHotkeyFocusSetting(); }
};
3 changes: 3 additions & 0 deletions shared/properties-view/properties-view.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1922,6 +1922,7 @@ bool WidgetInfo::ColorChangedInternal(const char *setting, bool supportAlpha)
options |= QColorDialog::DontUseNativeDialog;
#endif

HotkeyBlocker hb;
color = QColorDialog::getColor(color, view, QT_UTF8(desc), options);

#ifdef __APPLE__
Expand Down Expand Up @@ -1976,6 +1977,8 @@ bool WidgetInfo::FontChanged(const char *setting)
options = QFontDialog::DontUseNativeDialog;
#endif

HotkeyBlocker hb;

if (!font_obj) {
QFont initial;
font = QFontDialog::getFont(
Expand Down
4 changes: 4 additions & 0 deletions shared/qt/wrappers/qt-wrappers.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ void setThemeID(QWidget *widget, const QString &themeID)

QString SelectDirectory(QWidget *parent, QString title, QString path)
{
HotkeyBlocker hb;
QString dir = QFileDialog::getExistingDirectory(
parent, title, path,
QFileDialog::ShowDirsOnly | QFileDialog::DontResolveSymlinks);
Expand All @@ -342,6 +343,7 @@ QString SelectDirectory(QWidget *parent, QString title, QString path)
QString SaveFile(QWidget *parent, QString title, QString path,
QString extensions)
{
HotkeyBlocker hb;
QString file =
QFileDialog::getSaveFileName(parent, title, path, extensions);

Expand All @@ -351,6 +353,7 @@ QString SaveFile(QWidget *parent, QString title, QString path,
QString OpenFile(QWidget *parent, QString title, QString path,
QString extensions)
{
HotkeyBlocker hb;
QString file =
QFileDialog::getOpenFileName(parent, title, path, extensions);

Expand All @@ -360,6 +363,7 @@ QString OpenFile(QWidget *parent, QString title, QString path,
QStringList OpenFiles(QWidget *parent, QString title, QString path,
QString extensions)
{
HotkeyBlocker hb;
QStringList files =
QFileDialog::getOpenFileNames(parent, title, path, extensions);

Expand Down