claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into multimonitor-take2-ui

Browse Source
This commit is contained in:
Cacodemon345
2022-07-10 11:44:58 +06:00
committed by GitHub
parent c0c873151b 3ca8ed85d3
commit 11a75f5fd5
40 changed files with 801 additions and 312 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/qt_mainwindow.hpp
View File

@@ -25,7 +25,7 @@ public:
explicit MainWindow(QWidget *parent = nullptr);
~MainWindow();
void showMessage(const QString& header, const QString& message);
void showMessage(int flags, const QString& header, const QString& message);
void getTitle(wchar_t* title);
void blitToWidget(int x, int y, int w, int h, int monitor_index);
QSize getRenderWidgetSize();
@@ -51,7 +51,7 @@ signals:
void setFullscreen(bool state);
void setMouseCapture(bool state);
void showMessageForNonQtThread(const QString& header, const QString& message);
void showMessageForNonQtThread(int flags, const QString& header, const QString& message);
void getTitleForNonQtThread(wchar_t* title);
public slots:
void showSettings();
@@ -108,7 +108,7 @@ private slots:
void on_actionRenderer_options_triggered();
void refreshMediaMenu();
void showMessage_(const QString& header, const QString& message);
void showMessage_(int flags, const QString& header, const QString& message);
void getTitle_(wchar_t* title);
void on_actionMCA_devices_triggered();