From 2765d18634299a738cb689b055511a51ac947b53 Mon Sep 17 00:00:00 2001 From: Yuhang Zhao Date: Mon, 20 Nov 2023 10:31:03 +0800 Subject: [PATCH] win: don't show two tooltips Fixes: #325 --- src/quick/quickstandardtitlebar.cpp | 2 +- src/widgets/standardtitlebar.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/quick/quickstandardtitlebar.cpp b/src/quick/quickstandardtitlebar.cpp index 97e848e8..1bb665b6 100644 --- a/src/quick/quickstandardtitlebar.cpp +++ b/src/quick/quickstandardtitlebar.cpp @@ -245,7 +245,7 @@ void QuickStandardTitleBar::setWindowIcon(const QVariant &value) void QuickStandardTitleBar::updateMaximizeButton() { -#if (!defined(Q_OS_MACOS) && FRAMELESSHELPER_CONFIG(system_button)) +#if (FRAMELESSHELPER_CONFIG(system_button) && defined(Q_OS_LINUX)) const QQuickWindow * const w = window(); if (!w) { return; diff --git a/src/widgets/standardtitlebar.cpp b/src/widgets/standardtitlebar.cpp index 398e5bbd..a1de43dd 100644 --- a/src/widgets/standardtitlebar.cpp +++ b/src/widgets/standardtitlebar.cpp @@ -293,7 +293,7 @@ bool StandardTitleBarPrivate::isInTitleBarIconArea(const QPoint &pos) const void StandardTitleBarPrivate::updateMaximizeButton() { -#if (!defined(Q_OS_MACOS) && FRAMELESSHELPER_CONFIG(system_button)) +#if (FRAMELESSHELPER_CONFIG(system_button) && defined(Q_OS_LINUX)) const bool max = window->isMaximized(); maximizeButton->setButtonType(max ? SystemButtonType::Restore : SystemButtonType::Maximize); maximizeButton->setToolTip(max ? tr("Restore") : tr("Maximize"));