benkyd/flameshot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Show the Help Text, Tool Settings on the current active monitor

Browse Source
This commit is contained in:
Mantas-2155X
2021-01-25 16:51:09 +02:00
committed by borgmanJeremy
parent 265e42c7b0
commit 7daca5ff90
1 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -323,7 +323,7 @@ void CaptureWidget::paintEvent(QPaintEvent*)
if (m_showInitialMsg) {
#if (defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX))
defined(Q_OS_MACX) || defined(Q_OS_LINUX))
QRect helpRect;
QScreen* currentScreen = QGuiApplication::screenAt(QCursor::pos());
if (currentScreen) {
@@ -712,11 +712,24 @@ void CaptureWidget::initPanel()
{
QRect panelRect = rect();
if (m_context.fullscreen) {
#if (defined(Q_OS_MAC) || defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || \
defined(Q_OS_MACX) || defined(Q_OS_LINUX))
QScreen* currentScreen = QGuiApplication::screenAt(QCursor::pos());
if (currentScreen) {
panelRect = currentScreen->geometry();
auto devicePixelRatio = currentScreen->devicePixelRatio();
panelRect.moveTo(panelRect.x() / devicePixelRatio, panelRect.y() / devicePixelRatio);
} else {
panelRect = QGuiApplication::primaryScreen()->geometry();
auto devicePixelRatio = QGuiApplication::primaryScreen()->devicePixelRatio();
panelRect.moveTo(panelRect.x() / devicePixelRatio, panelRect.y() / devicePixelRatio);
}
#else
panelRect = QGuiApplication::primaryScreen()->geometry();
auto devicePixelRatio =
QGuiApplication::primaryScreen()->devicePixelRatio();
panelRect.moveTo(panelRect.x() / devicePixelRatio,
panelRect.y() / devicePixelRatio);
auto devicePixelRatio = QGuiApplication::primaryScreen()->devicePixelRatio();
panelRect.moveTo(panelRect.x() / devicePixelRatio, panelRect.y() / devicePixelRatio);
#endif
}
ConfigHandler config;