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

Code refactoring - remove Q_OS_MACX (is not required, is covered by Q_OS_DARWIN)

Browse Source 
(cherry picked from commit 00b9aae5266aaffb9a01a6f689e1829ae8218bdc)
This commit is contained in:
Yuriy Puchkov
2021-02-10 20:01:12 +02:00
parent 296bed0491
commit dd54d028a1
15 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tools/pin/pintool.cpp
View File

@@ -52,7 +52,7 @@ QString PinTool::description() const
QWidget* PinTool::widget()
{
qreal devicePixelRatio = 1;
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || defined(Q_OS_MACX))
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
QScreen* currentScreen = QGuiAppCurrentScreen().currentScreen();
if (currentScreen) {
devicePixelRatio = currentScreen->devicePixelRatio();
@@ -62,7 +62,7 @@ QWidget* PinTool::widget()
const int m = w->margin() * devicePixelRatio;
QRect adjusted_pos = m_geometry + QMargins(m, m, m, m);
w->setGeometry(adjusted_pos);
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS) || defined(Q_OS_MACX))
#if (defined(Q_OS_MAC64) || defined(Q_OS_MACOS))
if (currentScreen) {
QPoint topLeft = currentScreen->geometry().topLeft();
adjusted_pos.setX((adjusted_pos.x() - topLeft.x()) / devicePixelRatio +