Compare commits

..

No commits in common. "1764a8a9180b40874a2c016c34b67ca353c38adb" and "096d30b8cf81392fde2b54abe41be82423a125ae" have entirely different histories.

2 changed files with 4 additions and 4 deletions

View File

@ -245,7 +245,7 @@ void QuickStandardTitleBar::setWindowIcon(const QVariant &value)
void QuickStandardTitleBar::updateMaximizeButton() void QuickStandardTitleBar::updateMaximizeButton()
{ {
#if (FRAMELESSHELPER_CONFIG(system_button) && defined(Q_OS_LINUX)) #if (!defined(Q_OS_MACOS) && FRAMELESSHELPER_CONFIG(system_button))
const QQuickWindow * const w = window(); const QQuickWindow * const w = window();
if (!w) { if (!w) {
return; return;
@ -361,7 +361,7 @@ void QuickStandardTitleBar::clickCloseButton()
void QuickStandardTitleBar::retranslateUi() void QuickStandardTitleBar::retranslateUi()
{ {
#if (FRAMELESSHELPER_CONFIG(system_button) && defined(Q_OS_LINUX)) #if (!defined(Q_OS_MACOS) && FRAMELESSHELPER_CONFIG(system_button))
qobject_cast<QQuickToolTipAttached *>(qmlAttachedPropertiesObject<QQuickToolTip>(m_minimizeButton))->setText(tr("Minimize")); qobject_cast<QQuickToolTipAttached *>(qmlAttachedPropertiesObject<QQuickToolTip>(m_minimizeButton))->setText(tr("Minimize"));
qobject_cast<QQuickToolTipAttached *>(qmlAttachedPropertiesObject<QQuickToolTip>(m_maximizeButton))->setText([this]() -> QString { qobject_cast<QQuickToolTipAttached *>(qmlAttachedPropertiesObject<QQuickToolTip>(m_maximizeButton))->setText([this]() -> QString {
if (const QQuickWindow * const w = window()) { if (const QQuickWindow * const w = window()) {

View File

@ -293,7 +293,7 @@ bool StandardTitleBarPrivate::isInTitleBarIconArea(const QPoint &pos) const
void StandardTitleBarPrivate::updateMaximizeButton() void StandardTitleBarPrivate::updateMaximizeButton()
{ {
#if (FRAMELESSHELPER_CONFIG(system_button) && defined(Q_OS_LINUX)) #if (!defined(Q_OS_MACOS) && FRAMELESSHELPER_CONFIG(system_button))
const bool max = window->isMaximized(); const bool max = window->isMaximized();
maximizeButton->setButtonType(max ? SystemButtonType::Restore : SystemButtonType::Maximize); maximizeButton->setButtonType(max ? SystemButtonType::Restore : SystemButtonType::Maximize);
maximizeButton->setToolTip(max ? tr("Restore") : tr("Maximize")); maximizeButton->setToolTip(max ? tr("Restore") : tr("Maximize"));
@ -338,7 +338,7 @@ void StandardTitleBarPrivate::updateChromeButtonColor()
void StandardTitleBarPrivate::retranslateUi() void StandardTitleBarPrivate::retranslateUi()
{ {
#if (FRAMELESSHELPER_CONFIG(system_button) && defined(Q_OS_LINUX)) #if (!defined(Q_OS_MACOS) && FRAMELESSHELPER_CONFIG(system_button))
minimizeButton->setToolTip(tr("Minimize")); minimizeButton->setToolTip(tr("Minimize"));
maximizeButton->setToolTip(window->isMaximized() ? tr("Restore") : tr("Maximize")); maximizeButton->setToolTip(window->isMaximized() ? tr("Restore") : tr("Maximize"));
closeButton->setToolTip(tr("Close")); closeButton->setToolTip(tr("Close"));