Qt: Apply clang-format to MainWindow

This commit is contained in:
Gonzalosilvalde 2025-01-26 18:10:12 +01:00 committed by Gonzalosilvalde
parent 4134a594f5
commit 6a3aa9a56b
2 changed files with 37 additions and 32 deletions

View File

@ -107,7 +107,7 @@ MainWindow::MainWindow()
#if !defined(_WIN32) && !defined(__APPLE__)
s_use_central_widget = DisplayContainer::isRunningOnWayland();
#endif
createCheckMousePositionTimer();
createCheckMousePositionTimer();
}
MainWindow::~MainWindow()
@ -1071,16 +1071,18 @@ bool MainWindow::shouldHideMainWindow() const
}
bool MainWindow::shouldMouseGrab() const
{
if (!s_vm_valid || s_vm_paused) return false;
{
if (!s_vm_valid || s_vm_paused)
return false;
if (!Host::GetBoolSettingValue("EmuCore", "EnableMouseGrab", false)) return false;
if (!Host::GetBoolSettingValue("EmuCore", "EnableMouseGrab", false))
return false;
bool windowsHidden = (!m_debugger_window || m_debugger_window->isHidden()) &&
(!m_controller_settings_window || m_controller_settings_window->isHidden()) &&
(!m_settings_window || m_settings_window->isHidden());
bool windowsHidden = (!m_debugger_window || m_debugger_window->isHidden()) &&
(!m_controller_settings_window || m_controller_settings_window->isHidden()) &&
(!m_settings_window || m_settings_window->isHidden());
return windowsHidden && (isActiveWindow() || isRenderingFullscreen());
return windowsHidden && (isActiveWindow() || isRenderingFullscreen());
}
bool MainWindow::shouldAbortForMemcardBusy(const VMLock& lock)
@ -2543,29 +2545,32 @@ QWidget* MainWindow::getDisplayContainer() const
return (m_display_container ? static_cast<QWidget*>(m_display_container) : static_cast<QWidget*>(m_display_widget));
}
void MainWindow::createCheckMousePositionTimer(){
m_mouse_check_timer = new QTimer(this);
connect(m_mouse_check_timer, &QTimer::timeout, this, &MainWindow::checkMousePosition);
m_mouse_check_timer->start(16);
void MainWindow::createCheckMousePositionTimer()
{
m_mouse_check_timer = new QTimer(this);
connect(m_mouse_check_timer, &QTimer::timeout, this, &MainWindow::checkMousePosition);
m_mouse_check_timer->start(16);
}
void MainWindow::checkMousePosition() {
if (!shouldMouseGrab()) return;
void MainWindow::checkMousePosition()
{
if (!shouldMouseGrab())
return;
QPoint globalCursorPos = QCursor::pos();
const QRect& windowBounds = isRenderingFullscreen() ? screen()->geometry() : geometry();
QPoint globalCursorPos = QCursor::pos();
const QRect& windowBounds = isRenderingFullscreen() ? screen()->geometry() : geometry();
if (windowBounds.contains(globalCursorPos)) return;
if (windowBounds.contains(globalCursorPos))
return;
QCursor::setPos(
std::clamp(globalCursorPos.x(), windowBounds.left(), windowBounds.right()),
std::clamp(globalCursorPos.y(), windowBounds.top(), windowBounds.bottom())
);
QCursor::setPos(
std::clamp(globalCursorPos.x(), windowBounds.left(), windowBounds.right()),
std::clamp(globalCursorPos.y(), windowBounds.top(), windowBounds.bottom()));
}
void MainWindow::mouseMoveEvent(QMouseEvent *event){
QWidget::mouseMoveEvent(event);
void MainWindow::mouseMoveEvent(QMouseEvent* event)
{
QWidget::mouseMoveEvent(event);
}

View File

@ -60,8 +60,8 @@ public:
/// Returns the parent widget, which can be used for any popup dialogs.
__fi QWidget* getDialogParent() const { return m_dialog_parent; }
/// Cancels any pending unpause/fullscreen transition.
/// Call when you're going to destroy the VM anyway.
/// Cancels any pending unpause/fullscreen transition.
/// Call when you're going to destroy the VM anyway.
void cancelResume();
private:
@ -128,7 +128,7 @@ private Q_SLOTS:
void mouseModeRequested(bool relative_mode, bool hide_cursor);
void releaseRenderWindow();
void focusDisplayWidget();
void createCheckMousePositionTimer();
void createCheckMousePositionTimer();
void onGameListRefreshComplete();
void onGameListRefreshProgress(const QString& status, int current, int total);
void onGameListSelectionChanged();
@ -186,7 +186,7 @@ private Q_SLOTS:
void onVMResumed();
void onVMStopped();
void checkMousePosition();
void checkMousePosition();
void onGameChanged(const QString& title, const QString& elf_override, const QString& disc_path,
const QString& serial, quint32 disc_crc, quint32 crc);
@ -205,7 +205,7 @@ protected:
void dropEvent(QDropEvent* event) override;
void moveEvent(QMoveEvent* event) override;
void resizeEvent(QResizeEvent* event) override;
void mouseMoveEvent(QMouseEvent* event) override;
void mouseMoveEvent(QMouseEvent* event) override;
#ifdef _WIN32
bool nativeEvent(const QByteArray& eventType, void* message, qintptr* result) override;
@ -240,7 +240,7 @@ private:
bool isRenderingToMain() const;
bool shouldHideMouseCursor() const;
bool shouldHideMainWindow() const;
bool shouldMouseGrab() const;
bool shouldMouseGrab() const;
void switchToGameListView();
void switchToEmulationView();
@ -310,10 +310,10 @@ private:
bool m_was_disc_change_request = false;
bool m_is_closing = false;
bool m_is_temporarily_windowed = false;
QString m_last_fps_status;
QTimer* m_mouse_check_timer = nullptr;
QTimer* m_mouse_check_timer = nullptr;
#ifdef _WIN32
void* m_device_notification_handle = nullptr;