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

Merge pull request #1388 from namecheap/nc/fix_macos_tool_settings

Browse Source 
NC/fix - MacOS - Tool Settings on secondary display is at strange position
This commit is contained in:
borgmanJeremy
2021-02-24 09:26:16 -06:00
committed by GitHub
parent 2b0184a24a b699bdd4ca
commit 39dcd1a291
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -707,19 +707,10 @@ void CaptureWidget::initPanel()
if (m_context.fullscreen) {
#if (defined(Q_OS_MACOS) || defined(Q_OS_LINUX))
QScreen* currentScreen = QGuiAppCurrentScreen().currentScreen();
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);
}
panelRect = currentScreen->geometry();
auto devicePixelRatio = currentScreen->devicePixelRatio();
panelRect.moveTo(panelRect.x() / devicePixelRatio,
panelRect.y() / devicePixelRatio);
#else
panelRect = QGuiApplication::primaryScreen()->geometry();
auto devicePixelRatio =
@@ -729,18 +720,22 @@ void CaptureWidget::initPanel()
#endif
}
ConfigHandler config;
if (config.showSidePanelButtonValue()) {
if (ConfigHandler().showSidePanelButtonValue()) {
auto* panelToggleButton =
new OrientablePushButton(tr("Tool Settings"), this);
makeChild(panelToggleButton);
panelToggleButton->setColor(m_uiColor);
panelToggleButton->setOrientation(
OrientablePushButton::VerticalBottomToTop);
#if defined(Q_OS_MACOS)
panelToggleButton->move(0,
panelRect.y() + panelRect.height() / 2 -
panelToggleButton->width() / 2);
#else
panelToggleButton->move(panelRect.x(),
panelRect.y() + panelRect.height() / 2 -
panelToggleButton->width() / 2);
#endif
panelToggleButton->setCursor(Qt::ArrowCursor);
(new DraggableWidgetMaker(this))->makeDraggable(panelToggleButton);
connect(panelToggleButton,