Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions src/bin/nsapps/RV/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,13 @@ int main(int argc, char* argv[])
// Device.
QApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);

// On macOS, ensure that the widget-based implementation is used instead of the native dialog.
// Rationale:
// - This prevents this Tahoe specific Qt bug (dialog buttons not clickable on macOS 26 Tahoe) :
// https://github.com/PCSX2/pcsx2/issues/13216
// - This will make RV more future proof when newer macOS versions are released
QApplication::setAttribute(Qt::AA_DontUseNativeDialogs);

// Now supporting high DPI displays by default
// Setting the following environment variable, disable the high DPI support
const bool noHighDPISupport = getenv("RV_NO_QT_HDPI_SUPPORT") != nullptr;
Expand Down
1 change: 0 additions & 1 deletion src/lib/app/RvCommon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,6 @@ SET(_sources
RvProfileManager.cpp
StreamConnection.cpp
RvJavaScriptObject.cpp
QAlertPanel.cpp
)

# IF(RV_TARGET_DARWIN) LIST(APPEND _sources CGDesktopVideoDevice.cpp CGDesktopVideoDeviceArm.cpp DisplayLink.cpp) ENDIF()
Expand Down
15 changes: 7 additions & 8 deletions src/lib/app/RvCommon/MuUICommands.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
#include <QtCore/QtCore>
#include <QtGui/QtGui>
#include <QtWidgets/QFileIconProvider>
#include "QAlertPanel.h"

#if defined(RV_VFX_CY2023)
#include <MuQt5/QNetworkAccessManagerType.h>
Expand Down Expand Up @@ -962,7 +961,7 @@ namespace Rv
const StringType::String* b2 = NODE_ARG_OBJECT(5, StringType::String);
const StringType::String* b3 = NODE_ARG_OBJECT(6, StringType::String);

QAlertPanel box(doc);
QMessageBox box(doc);
QString temp = UTF8::qconvert(title->c_str());

if (msg && *msg != *title)
Expand All @@ -982,25 +981,25 @@ namespace Rv
box.setWindowModality(Qt::WindowModal);
#endif

QPushButton* q1 = box.addButton(UTF8::qconvert(b1->c_str()), QAlertPanel::AcceptRole);
QPushButton* q2 = b2 ? box.addButton(UTF8::qconvert(b2->c_str()), QAlertPanel::RejectRole) : 0;
QPushButton* q3 = b3 ? box.addButton(UTF8::qconvert(b3->c_str()), QAlertPanel::ApplyRole) : 0;
QPushButton* q1 = box.addButton(UTF8::qconvert(b1->c_str()), QMessageBox::AcceptRole);
QPushButton* q2 = b2 ? box.addButton(UTF8::qconvert(b2->c_str()), QMessageBox::RejectRole) : 0;
QPushButton* q3 = b3 ? box.addButton(UTF8::qconvert(b3->c_str()), QMessageBox::ApplyRole) : 0;

switch (type)
{
case 0:
// Info
box.setIcon(QAlertPanel::Information);
box.setIcon(QMessageBox::Information);
break;

case 1:
// Warning
box.setIcon(QAlertPanel::Warning);
box.setIcon(QMessageBox::Warning);
break;

case 2:
// Error
box.setIcon(QAlertPanel::Critical);
box.setIcon(QMessageBox::Critical);
break;
}

Expand Down
302 changes: 0 additions & 302 deletions src/lib/app/RvCommon/QAlertPanel.cpp

This file was deleted.

Loading
Loading