|
 |
ca5e26 |
diff --git a/src/decoration/qgnomeplatformdecoration.cpp b/src/decoration/qgnomeplatformdecoration.cpp
|
|
|
ca5e26 |
index a719cb3..1346a01 100644
|
|
|
ca5e26 |
--- a/src/decoration/qgnomeplatformdecoration.cpp
|
|
|
ca5e26 |
+++ b/src/decoration/qgnomeplatformdecoration.cpp
|
|
|
ca5e26 |
@@ -180,7 +180,7 @@ QMargins QGnomePlatformDecoration::margins(MarginsType marginsType) const
|
|
|
ca5e26 |
#else
|
|
|
ca5e26 |
QMargins QGnomePlatformDecoration::margins() const
|
|
|
ca5e26 |
{
|
|
|
ca5e26 |
- if ((window()->windowStates() & Qt::WindowMaximized)) {
|
|
|
ca5e26 |
+ if ((waylandWindow()->windowStates() & Qt::WindowMaximized)) {
|
|
|
ca5e26 |
return QMargins(0, TITLEBAR_HEIGHT, 0, 0);
|
|
|
ca5e26 |
}
|
|
|
ca5e26 |
|
|
|
ca5e26 |
@@ -373,7 +373,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
|
|
|
ca5e26 |
// * *
|
|
|
ca5e26 |
// ********************************
|
|
|
ca5e26 |
QPainterPath borderRect;
|
|
|
ca5e26 |
- if (!(window()->windowStates() & Qt::WindowMaximized)) {
|
|
|
ca5e26 |
+ if (!(waylandWindow()->windowStates() & Qt::WindowMaximized)) {
|
|
|
ca5e26 |
borderRect.addRoundedRect(0, 0, surfaceRect.width(), margins().top() + 8, 10, 10);
|
|
|
ca5e26 |
p.fillPath(borderRect.simplified(), borderColor);
|
|
|
ca5e26 |
}
|
|
|
ca5e26 |
@@ -391,7 +391,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
|
|
|
ca5e26 |
// * *
|
|
|
ca5e26 |
// ********************************
|
|
|
ca5e26 |
QPainterPath roundedRect;
|
|
|
ca5e26 |
- if ((window()->windowStates() & Qt::WindowMaximized)) {
|
|
|
ca5e26 |
+ if ((waylandWindow()->windowStates() & Qt::WindowMaximized)) {
|
|
|
ca5e26 |
roundedRect.addRect(0, 0, surfaceRect.width(), margins().top() + 8);
|
|
|
ca5e26 |
} else {
|
|
|
ca5e26 |
roundedRect.addRoundedRect(WINDOW_BORDER_WIDTH, WINDOW_BORDER_WIDTH, surfaceRect.width() - margins().left() - margins().right(), margins().top() + 8, 8, 8);
|
|
|
ca5e26 |
@@ -414,7 +414,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
|
|
|
ca5e26 |
// *| |*
|
|
|
ca5e26 |
// *------------------------------*
|
|
|
ca5e26 |
// ********************************
|
|
|
ca5e26 |
- if (!(window()->windowStates() & Qt::WindowMaximized)) {
|
|
|
ca5e26 |
+ if (!(waylandWindow()->windowStates() & Qt::WindowMaximized)) {
|
|
|
ca5e26 |
QPainterPath borderPath;
|
|
|
ca5e26 |
// Left
|
|
|
ca5e26 |
borderPath.addRect(0, margins().top(), margins().left(), surfaceRect.height() - margins().top() - WINDOW_BORDER_WIDTH);
|
|
|
ca5e26 |
@@ -498,7 +498,7 @@ void QGnomePlatformDecoration::paint(QPaintDevice *device)
|
|
|
ca5e26 |
|
|
|
ca5e26 |
// Maximize button
|
|
|
ca5e26 |
if (GnomeSettings::titlebarButtons().testFlag(GnomeSettings::MaximizeButton)) {
|
|
|
ca5e26 |
- renderButton(&p, maximizeButtonRect(), (window()->windowStates() & Qt::WindowMaximized) ? Adwaita::ButtonType::ButtonRestore : Adwaita::ButtonType::ButtonMaximize,
|
|
|
ca5e26 |
+ renderButton(&p, maximizeButtonRect(), (waylandWindow()->windowStates() & Qt::WindowMaximized) ? Adwaita::ButtonType::ButtonRestore : Adwaita::ButtonType::ButtonMaximize,
|
|
|
ca5e26 |
m_maximizeButtonHovered && active, m_clicking == Button::Maximize || m_clicking == Button::Restore);
|
|
|
ca5e26 |
}
|
|
|
ca5e26 |
|