fergalmoran/flameshot
1
0
Fork 0
mirror of https://github.com/fergalmoran/flameshot.git synced 2026-02-13 14:03:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix - MacOS - activate new widgets, swith to fullscreen mode+hotkeys

Browse Source
This commit is contained in:
Yuriy Puchkov
2020-11-24 10:08:12 -08:00
parent 4c49461a7a
commit 69e698bdb1
2 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/controller.cpp
View File

@@ -152,7 +152,9 @@ void Controller::startVisualCapture(const uint id,
m_captureWindow->show();
#elif (defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
m_captureWindow->show();
// In "Emulate fullscreen mode"
// m_captureWindow->show();
m_captureWindow->showFullScreen();
m_captureWindow->activateWindow();
#else
m_captureWindow->showFullScreen();
@@ -185,6 +187,10 @@ void Controller::openConfigWindow()
if (!m_configWindow) {
m_configWindow = new ConfigWindow();
m_configWindow->show();
#if (defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
m_configWindow->activateWindow();
#endif
}
}
@@ -202,6 +208,10 @@ void Controller::openLauncherWindow()
m_launcherWindow = new CaptureLauncher();
}
m_launcherWindow->show();
#if (defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
m_launcherWindow->activateWindow();
#endif
}
void Controller::enableTrayIcon()
@@ -324,6 +334,10 @@ void Controller::showRecentScreenshots()
}
m_history->loadHistory();
m_history->show();
#if (defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
m_history->activateWindow();
#endif
}
void Controller::startFullscreenCapture(const uint id)

11
src/widgets/capture/capturewidget.cpp
View File

@@ -115,10 +115,13 @@ CaptureWidget::CaptureWidget(const uint id,
resize(pixmap().size());
#elif (defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
setWindowFlags(Qt::WindowStaysOnTopHint | Qt::BypassWindowManagerHint |
Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint |
Qt::ToolTip | Qt::Popup);
// Emulate fullscreen mode
// setWindowFlags(Qt::WindowStaysOnTopHint |
// Qt::BypassWindowManagerHint |
// Qt::FramelessWindowHint |
// Qt::NoDropShadowWindowHint | Qt::ToolTip |
// Qt::Popup
// );
QScreen* currentScreen = QGuiApplication::screenAt(QCursor::pos());
move(currentScreen->geometry().x(), currentScreen->geometry().y());
resize(currentScreen->size());