diff --git a/obs/obs-app.cpp b/obs/obs-app.cpp index 98e62a5e0..a0190556f 100644 --- a/obs/obs-app.cpp +++ b/obs/obs-app.cpp @@ -410,19 +410,6 @@ QString OBSTranslator::translate(const char *context, const char *sourceText, return QT_UTF8(out); } -struct NoFocusFrameStyle : QProxyStyle -{ - void drawControl(ControlElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget=nullptr) - const override - { - if (element == CE_FocusFrame) - return; - - QProxyStyle::drawControl(element, option, painter, widget); - } -}; - static bool get_token(lexer *lex, string &str, base_token_type type) { base_token token; @@ -611,7 +598,6 @@ static int run_program(fstream &logFile, int argc, char *argv[]) create_log_file(logFile); program.installTranslator(&translator); - program.setStyle(new NoFocusFrameStyle); ret = program.OBSInit() ? program.exec() : 0; diff --git a/obs/window-basic-main.cpp b/obs/window-basic-main.cpp index 2cd39506d..cdd2ff333 100644 --- a/obs/window-basic-main.cpp +++ b/obs/window-basic-main.cpp @@ -119,6 +119,9 @@ OBSBasic::OBSBasic(QWidget *parent) qRegisterMetaType("OBSSceneItem"); qRegisterMetaType ("OBSSource"); + ui->scenes->setAttribute(Qt::WA_MacShowFocusRect, false); + ui->sources->setAttribute(Qt::WA_MacShowFocusRect, false); + connect(windowHandle(), &QWindow::screenChanged, [this]() { struct obs_video_info ovi; diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp index a8b52ee40..f43959e71 100644 --- a/obs/window-basic-settings.cpp +++ b/obs/window-basic-settings.cpp @@ -217,6 +217,8 @@ OBSBasicSettings::OBSBasicSettings(QWidget *parent) ui->setupUi(this); + ui->listWidget->setAttribute(Qt::WA_MacShowFocusRect, false); + HookWidget(ui->language, COMBO_CHANGED, GENERAL_CHANGED); HookWidget(ui->theme, COMBO_CHANGED, GENERAL_CHANGED); HookWidget(ui->outputMode, COMBO_CHANGED, OUTPUTS_CHANGED); diff --git a/obs/window-basic-source-select.cpp b/obs/window-basic-source-select.cpp index bc67f58dc..626258f95 100644 --- a/obs/window-basic-source-select.cpp +++ b/obs/window-basic-source-select.cpp @@ -164,6 +164,8 @@ OBSBasicSourceSelect::OBSBasicSourceSelect(OBSBasic *parent, const char *id_) { ui->setupUi(this); + ui->sourceList->setAttribute(Qt::WA_MacShowFocusRect, false); + QString placeHolderText{QT_UTF8(obs_source_get_display_name( OBS_SOURCE_TYPE_INPUT, id))};