Compare commits
No commits in common. "1764a8a9180b40874a2c016c34b67ca353c38adb" and "096d30b8cf81392fde2b54abe41be82423a125ae" have entirely different histories.
1764a8a918
...
096d30b8cf
|
@ -245,7 +245,7 @@ void QuickStandardTitleBar::setWindowIcon(const QVariant &value)
|
|||
|
||||
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();
|
||||
if (!w) {
|
||||
return;
|
||||
|
@ -361,7 +361,7 @@ void QuickStandardTitleBar::clickCloseButton()
|
|||
|
||||
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_maximizeButton))->setText([this]() -> QString {
|
||||
if (const QQuickWindow * const w = window()) {
|
||||
|
|
|
@ -293,7 +293,7 @@ bool StandardTitleBarPrivate::isInTitleBarIconArea(const QPoint &pos) const
|
|||
|
||||
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();
|
||||
maximizeButton->setButtonType(max ? SystemButtonType::Restore : SystemButtonType::Maximize);
|
||||
maximizeButton->setToolTip(max ? tr("Restore") : tr("Maximize"));
|
||||
|
@ -338,7 +338,7 @@ void StandardTitleBarPrivate::updateChromeButtonColor()
|
|||
|
||||
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"));
|
||||
maximizeButton->setToolTip(window->isMaximized() ? tr("Restore") : tr("Maximize"));
|
||||
closeButton->setToolTip(tr("Close"));
|
||||
|
|
Loading…
Reference in New Issue