From db97e698b2aeb46d21ee5adc62cab95be9a4ae0f Mon Sep 17 00:00:00 2001 From: BearOso Date: Wed, 28 Jun 2023 16:09:03 -0500 Subject: [PATCH] Mouse cursor and Set Size->10x. --- qt/src/EmuMainWindow.cpp | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/qt/src/EmuMainWindow.cpp b/qt/src/EmuMainWindow.cpp index d155e000..8b996672 100644 --- a/qt/src/EmuMainWindow.cpp +++ b/qt/src/EmuMainWindow.cpp @@ -32,7 +32,8 @@ EmuMainWindow::EmuMainWindow(EmuApplication *app) mouse_timer.callOnTimeout([&] { if (cursor_visible && isActivelyDrawing()) { - setCursor(QCursor(Qt::BlankCursor)); + if (canvas) + canvas->setCursor(QCursor(Qt::BlankCursor)); cursor_visible = false; mouse_timer.stop(); } @@ -241,10 +242,10 @@ void EmuMainWindow::createWidgets() // Set Size Menu auto set_size_menu = new QMenu(tr("&Set Size")); - for (size_t i = 1; i <= 5; i++) + for (size_t i = 1; i <= 10; i++) { - auto item = new QAction(tr("&%1x").arg(i)); - set_size_menu->addAction(item); + auto string = (i == 10) ? tr("1&0x") : tr("&%1x").arg(i); + auto item = set_size_menu->addAction(string); item->connect(item, &QAction::triggered, this, [&, i](bool checked) { resizeToMultiple(i); }); @@ -472,7 +473,8 @@ bool EmuMainWindow::event(QEvent *event) case QEvent::MouseMove: if (!cursor_visible) { - setCursor(QCursor(Qt::ArrowCursor)); + if (canvas) + canvas->setCursor(QCursor(Qt::ArrowCursor)); cursor_visible = true; mouse_timer.start(); }