philipp/KDDockWidgets
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix maximize button not being updated

Browse Source 
Moved logic into controller
This commit is contained in:
Sergio Martins
2022-06-25 16:29:41 +01:00
parent 8f10d86cad
commit f640d8852b
7 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/qtwidgets/views/TitleBar_qtwidgets.cpp
View File

@@ -136,8 +136,6 @@ void TitleBar_qtwidgets::init()
connect(m_minimizeButton, &QAbstractButton::clicked, m_titleBar, &Controllers::TitleBar::onMinimizeClicked);
connect(m_autoHideButton, &QAbstractButton::clicked, m_titleBar, &Controllers::TitleBar::onAutoHideClicked);
updateMaximizeButton();
m_minimizeButton->setToolTip(tr("Minimize"));
m_closeButton->setToolTip(tr("Close"));
@@ -210,18 +208,14 @@ void TitleBar_qtwidgets::updateAutoHideButton(bool visible, bool enabled, TitleB
m_autoHideButton->setEnabled(enabled);
}
void TitleBar_qtwidgets::updateMaximizeButton()
void TitleBar_qtwidgets::updateMaximizeButton(bool visible, bool enabled, TitleBarButtonType type)
{
if (auto fw = m_titleBar->floatingWindow()) {
m_maximizeButton->setEnabled(enabled);
m_maximizeButton->setVisible(visible);
if (visible) {
auto factory = Config::self().viewFactory();
const TitleBarButtonType iconType = fw->isMaximizedOverride() ? TitleBarButtonType::Normal
: TitleBarButtonType::Maximize;
m_maximizeButton->setIcon(factory->iconForButtonType(iconType, devicePixelRatioF()));
m_maximizeButton->setVisible(m_titleBar->supportsMaximizeButton());
m_maximizeButton->setToolTip(fw->isMaximizedOverride() ? tr("Restore") : tr("Maximize"));
} else {
m_maximizeButton->setVisible(false);
m_maximizeButton->setIcon(factory->iconForButtonType(type, devicePixelRatioF()));
m_maximizeButton->setToolTip(type == TitleBarButtonType::Normal ? tr("Restore") : tr("Maximize"));
}
}

4
src/qtwidgets/views/TitleBar_qtwidgets.h
View File

@@ -48,9 +48,7 @@ protected:
QRect iconRect() const;
void updateMargins();
// TODOm3:
void updateMaximizeButton() override;
void updateMaximizeButton(bool visible, bool enabled, TitleBarButtonType);
void updateAutoHideButton(bool visible, bool enabled, TitleBarButtonType);
void updateMinimizeButton(bool visible, bool enabled);