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

resolving merge conflicts

Browse Source
This commit is contained in:
Jeremy Borgman
2021-01-08 09:58:52 -06:00
parent c84b6df7d3 b1ba67ac4d
commit 73fe772b70
90 changed files with 7190 additions and 3036 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/widgets/panel/utilitypanel.cpp
View File

@@ -43,7 +43,10 @@ UtilityPanel::UtilityPanel(QWidget* parent)
m_internalPanel,
&QWidget::hide);
hide();
#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(Q_OS_MAC64) || \
defined(Q_OS_MACOS) || defined(Q_OS_MACX))
move(0, 0);
#endif
}
QWidget* UtilityPanel::toolWidget() const
@@ -83,6 +86,10 @@ void UtilityPanel::show()
m_showAnimation->setEndValue(QRect(0, 0, width(), height()));
m_internalPanel->show();
m_showAnimation->start();
#if (defined(Q_OS_WIN) || defined(Q_OS_MAC) || defined(Q_OS_MAC64) || \
defined(Q_OS_MACOS) || defined(Q_OS_MACX))
move(0, 0);
#endif
QWidget::show();
}
@@ -134,9 +141,5 @@ void UtilityPanel::initInternalPanel()
m_hide->setText(tr("Hide"));
m_upLayout->addWidget(m_hide);
connect(m_hide, SIGNAL(clicked()), this, SLOT(slotHidePanel()));
}
void UtilityPanel::slotHidePanel()
{
hide();
m_internalPanel->hide();
}