From fe7affa7f8b55f6db20bc5a38b664f11f0c5eb3c Mon Sep 17 00:00:00 2001 From: Boyuan Yang Date: Sat, 20 Feb 2021 19:26:28 -0500 Subject: [PATCH] tools: pin: pintool.h,cpp: Convert to unix fileending Since pintool.h and pintool.cpp were using \r\n instead of \n, this commit fixes that and use \n only. --- src/tools/pin/pintool.cpp | 160 +++++++++++++++++++------------------- src/tools/pin/pintool.h | 66 ++++++++-------- 2 files changed, 113 insertions(+), 113 deletions(-) diff --git a/src/tools/pin/pintool.cpp b/src/tools/pin/pintool.cpp index 9b5b9d37..9e62f3b1 100644 --- a/src/tools/pin/pintool.cpp +++ b/src/tools/pin/pintool.cpp @@ -1,80 +1,80 @@ -// SPDX-License-Identifier: GPL-3.0-or-later -// SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors - -#include "pintool.h" -#include "src/core/qguiappcurrentscreen.h" -#include "src/tools/pin/pinwidget.h" -#include - -PinTool::PinTool(QObject* parent) - : AbstractActionTool(parent) -{} - -bool PinTool::closeOnButtonPressed() const -{ - return true; -} - -QIcon PinTool::icon(const QColor& background, bool inEditor) const -{ - Q_UNUSED(inEditor); - return QIcon(iconPath(background) + "pin.svg"); -} -QString PinTool::name() const -{ - return tr("Pin Tool"); -} - -ToolType PinTool::nameID() const -{ - return ToolType::PIN; -} - -QString PinTool::description() const -{ - return tr("Pin image on the desktop"); -} - -QWidget* PinTool::widget() -{ - qreal devicePixelRatio = 1; -#if defined(Q_OS_MACOS) - QScreen* currentScreen = QGuiAppCurrentScreen().currentScreen(); - if (currentScreen) { - devicePixelRatio = currentScreen->devicePixelRatio(); - } -#endif - PinWidget* w = new PinWidget(m_pixmap); - const int m = w->margin() * devicePixelRatio; - QRect adjusted_pos = m_geometry + QMargins(m, m, m, m); - w->setGeometry(adjusted_pos); -#if defined(Q_OS_MACOS) - if (currentScreen) { - QPoint topLeft = currentScreen->geometry().topLeft(); - adjusted_pos.setX((adjusted_pos.x() - topLeft.x()) / devicePixelRatio + - topLeft.x()); - - adjusted_pos.setY((adjusted_pos.y() - topLeft.y()) / devicePixelRatio + - topLeft.y()); - adjusted_pos.setWidth(adjusted_pos.size().width() / devicePixelRatio); - adjusted_pos.setHeight(adjusted_pos.size().height() / devicePixelRatio); - w->resize(0, 0); - w->move(adjusted_pos.x(), adjusted_pos.y()); - } -#endif - return w; -} - -CaptureTool* PinTool::copy(QObject* parent) -{ - return new PinTool(parent); -} - -void PinTool::pressed(const CaptureContext& context) -{ - emit requestAction(REQ_CAPTURE_DONE_OK); - m_geometry = context.selection; - m_geometry.setTopLeft(m_geometry.topLeft() + context.widgetOffset); - m_pixmap = context.selectedScreenshotArea(); - emit requestAction(REQ_ADD_EXTERNAL_WIDGETS); -} +// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors + +#include "pintool.h" +#include "src/core/qguiappcurrentscreen.h" +#include "src/tools/pin/pinwidget.h" +#include + +PinTool::PinTool(QObject* parent) + : AbstractActionTool(parent) +{} + +bool PinTool::closeOnButtonPressed() const +{ + return true; +} + +QIcon PinTool::icon(const QColor& background, bool inEditor) const +{ + Q_UNUSED(inEditor); + return QIcon(iconPath(background) + "pin.svg"); +} +QString PinTool::name() const +{ + return tr("Pin Tool"); +} + +ToolType PinTool::nameID() const +{ + return ToolType::PIN; +} + +QString PinTool::description() const +{ + return tr("Pin image on the desktop"); +} + +QWidget* PinTool::widget() +{ + qreal devicePixelRatio = 1; +#if defined(Q_OS_MACOS) + QScreen* currentScreen = QGuiAppCurrentScreen().currentScreen(); + if (currentScreen) { + devicePixelRatio = currentScreen->devicePixelRatio(); + } +#endif + PinWidget* w = new PinWidget(m_pixmap); + const int m = w->margin() * devicePixelRatio; + QRect adjusted_pos = m_geometry + QMargins(m, m, m, m); + w->setGeometry(adjusted_pos); +#if defined(Q_OS_MACOS) + if (currentScreen) { + QPoint topLeft = currentScreen->geometry().topLeft(); + adjusted_pos.setX((adjusted_pos.x() - topLeft.x()) / devicePixelRatio + + topLeft.x()); + + adjusted_pos.setY((adjusted_pos.y() - topLeft.y()) / devicePixelRatio + + topLeft.y()); + adjusted_pos.setWidth(adjusted_pos.size().width() / devicePixelRatio); + adjusted_pos.setHeight(adjusted_pos.size().height() / devicePixelRatio); + w->resize(0, 0); + w->move(adjusted_pos.x(), adjusted_pos.y()); + } +#endif + return w; +} + +CaptureTool* PinTool::copy(QObject* parent) +{ + return new PinTool(parent); +} + +void PinTool::pressed(const CaptureContext& context) +{ + emit requestAction(REQ_CAPTURE_DONE_OK); + m_geometry = context.selection; + m_geometry.setTopLeft(m_geometry.topLeft() + context.widgetOffset); + m_pixmap = context.selectedScreenshotArea(); + emit requestAction(REQ_ADD_EXTERNAL_WIDGETS); +} diff --git a/src/tools/pin/pintool.h b/src/tools/pin/pintool.h index f673e7be..8f95ed4d 100644 --- a/src/tools/pin/pintool.h +++ b/src/tools/pin/pintool.h @@ -1,33 +1,33 @@ -// SPDX-License-Identifier: GPL-3.0-or-later -// SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors - -#pragma once - -#include "src/tools/abstractactiontool.h" - -class PinTool : public AbstractActionTool -{ - Q_OBJECT -public: - explicit PinTool(QObject* parent = nullptr); - - bool closeOnButtonPressed() const override; - - QIcon icon(const QColor& background, bool inEditor) const override; - QString name() const override; - QString description() const override; - - QWidget* widget() override; - - CaptureTool* copy(QObject* parent = nullptr) override; - -protected: - ToolType nameID() const override; - -public slots: - void pressed(const CaptureContext& context) override; - -private: - QRect m_geometry; - QPixmap m_pixmap; -}; +// SPDX-License-Identifier: GPL-3.0-or-later +// SPDX-FileCopyrightText: 2017-2019 Alejandro Sirgo Rica & Contributors + +#pragma once + +#include "src/tools/abstractactiontool.h" + +class PinTool : public AbstractActionTool +{ + Q_OBJECT +public: + explicit PinTool(QObject* parent = nullptr); + + bool closeOnButtonPressed() const override; + + QIcon icon(const QColor& background, bool inEditor) const override; + QString name() const override; + QString description() const override; + + QWidget* widget() override; + + CaptureTool* copy(QObject* parent = nullptr) override; + +protected: + ToolType nameID() const override; + +public slots: + void pressed(const CaptureContext& context) override; + +private: + QRect m_geometry; + QPixmap m_pixmap; +};