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

Merge branch 'master' into qt-scroll-states

Browse Source
This commit is contained in:
Cacodemon345
2025-05-06 12:23:23 +06:00
committed by GitHub
parent 7e3cf32dca eb82f9bcca
commit 5b5a13ac56
258 changed files with 20390 additions and 8738 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/qt/qt_mainwindow.hpp
View File

@@ -6,6 +6,7 @@
#include <QEvent>
#include <QFocusEvent>
#include <QLabel>
#include <QShortcut>
#include <memory>
#include <array>
@@ -27,14 +28,16 @@ public:
explicit MainWindow(QWidget *parent = nullptr);
~MainWindow();
void showMessage(int flags, const QString &header, const QString &message);
void showMessage(int flags, const QString &header, const QString &message, bool richText);
void getTitle(wchar_t *title);
void blitToWidget(int x, int y, int w, int h, int monitor_index);
QSize getRenderWidgetSize();
void setSendKeyboardInput(bool enabled);
void checkFullscreenHotkey();
void reloadAllRenderers();
QShortcut *windowedShortcut;
QKeySequence FindAcceleratorSeq(const char *name);
std::array<std::unique_ptr<RendererStack>, 8> renderers;
signals:
void paint(const QImage &image);
@@ -57,7 +60,7 @@ signals:
void setFullscreen(bool state);
void setMouseCapture(bool state);
void showMessageForNonQtThread(int flags, const QString &header, const QString &message, std::atomic_bool* done);
void showMessageForNonQtThread(int flags, const QString &header, const QString &message, bool richText, std::atomic_bool* done);
void getTitleForNonQtThread(wchar_t *title);
public slots:
void showSettings();
@@ -118,13 +121,14 @@ private slots:
void on_actionHide_tool_bar_triggered();
void on_actionUpdate_status_bar_icons_triggered();
void on_actionTake_screenshot_triggered();
void on_actionMute_Unmute_triggered();
void on_actionSound_gain_triggered();
void on_actionPreferences_triggered();
void on_actionEnable_Discord_integration_triggered(bool checked);
void on_actionRenderer_options_triggered();
void refreshMediaMenu();
void showMessage_(int flags, const QString &header, const QString &message, std::atomic_bool* done = nullptr);
void showMessage_(int flags, const QString &header, const QString &message, bool richText, std::atomic_bool* done = nullptr);
void getTitle_(wchar_t *title);
void on_actionMCA_devices_triggered();
@@ -160,6 +164,7 @@ private:
std::unique_ptr<MachineStatus> status;
std::shared_ptr<MediaMenu> mm;
void updateShortcuts();
void processKeyboardInput(bool down, uint32_t keycode);
#ifdef Q_OS_MACOS
uint32_t last_modifiers = 0;
@@ -187,7 +192,6 @@ private:
QLabel *caps_label, *scroll_label, *num_label;
bool isShowMessage = false;
};