fix decorationsType handle error

Author: zzxyb

examples/tinywl/helper.cpp

@@ -299,10 +299,10 @@ void Helper::init()
             auto xwayland = qobject_cast<WXWaylandSurface *>(wrapper->shellSurface());
             auto updateDecorationTitleBar = [this, wrapper, xwayland]() {
                 if (!xwayland->isBypassManager()) {
-                    wrapper->setNoTitleBar(xwayland->decorationsType()
-                                           == WXWaylandSurface::DecorationsNoTitle);
-                    wrapper->setNoDecoration(xwayland->decorationsType()
-                                             == WXWaylandSurface::DecorationsNoBorder);
+                    wrapper->setNoTitleBar(xwayland->decorationsTypes()
+                                           & WXWaylandSurface::DecorationsNoTitle);
+                    wrapper->setNoDecoration(xwayland->decorationsTypes()
+                                             & WXWaylandSurface::DecorationsNoBorder);
                 } else {
                     wrapper->setNoTitleBar(true);
                     wrapper->setNoDecoration(true);
@@ -312,7 +312,7 @@ void Helper::init()
             // but WXWaylandSurface will not, so must connect to `wrapper`
             connect(xwayland, &WXWaylandSurface::bypassManagerChanged, wrapper, updateDecorationTitleBar);
             connect(xwayland,
-                    &WXWaylandSurface::decorationsTypeChanged,
+                    &WXWaylandSurface::decorationsTypesChanged,
                     wrapper,
                     updateDecorationTitleBar);
             updateDecorationTitleBar();

src/server/protocols/wxwaylandsurface.cpp

@@ -139,7 +139,7 @@ void WXWaylandSurfacePrivate::init()
                          updateWindowTypes();
                      });
     QObject::connect(handle(), &qw_xwayland_surface::notify_set_decorations,
-                     q, &WXWaylandSurface::decorationsTypeChanged);
+                     q, &WXWaylandSurface::decorationsTypesChanged);
     QObject::connect(handle(), &qw_xwayland_surface::notify_set_title,
                      q, &WXWaylandSurface::titleChanged);
     QObject::connect(handle(), &qw_xwayland_surface::notify_set_class,
@@ -455,10 +455,10 @@ WXWaylandSurface::WindowTypes WXWaylandSurface::windowTypes() const
     return d->windowTypes;
 }
 
-WXWaylandSurface::DecorationsType WXWaylandSurface::decorationsType() const
+WXWaylandSurface::DecorationsTypes WXWaylandSurface::decorationsTypes() const
 {
     W_DC(WXWaylandSurface);
-    return static_cast<DecorationsType>(d->nativeHandle()->decorations);
+    return static_cast<DecorationsTypes>(d->nativeHandle()->decorations);
 }
 
 bool WXWaylandSurface::checkNewSize(const QSize &size, QSize *clipedSize)

src/server/protocols/wxwaylandsurface.h

@@ -28,7 +28,7 @@ class WAYLIB_SERVER_EXPORT WXWaylandSurface : public WToplevelSurface
     Q_PROPERTY(bool bypassManager READ isBypassManager NOTIFY bypassManagerChanged FINAL)
     Q_PROPERTY(QRect geometry READ geometry NOTIFY geometryChanged FINAL)
     Q_PROPERTY(WindowTypes windowTypes READ windowTypes NOTIFY windowTypesChanged FINAL)
-    Q_PROPERTY(DecorationsType decorationsType READ decorationsType NOTIFY decorationsTypeChanged FINAL)
+    Q_PROPERTY(DecorationsTypes decorationsTypes READ decorationsTypes NOTIFY decorationsTypesChanged FINAL)
     QML_NAMED_ELEMENT(XWaylandSurface)
     QML_UNCREATABLE("Only create in C++")
 
@@ -74,6 +74,7 @@ class WAYLIB_SERVER_EXPORT WXWaylandSurface : public WToplevelSurface
         DecorationsNoTitle = 2
     };
     Q_ENUM(DecorationsType)
+    Q_DECLARE_FLAGS(DecorationsTypes, DecorationsType)
 
     explicit WXWaylandSurface(QW_NAMESPACE::qw_xwayland_surface *handle, WXWayland *xwayland, QObject *parent = nullptr);
     ~WXWaylandSurface();
@@ -111,7 +112,7 @@ class WAYLIB_SERVER_EXPORT WXWaylandSurface : public WToplevelSurface
 
     bool isBypassManager() const;
     WindowTypes windowTypes() const;
-    DecorationsType decorationsType() const;
+    DecorationsTypes decorationsTypes() const;
 
 public Q_SLOTS:
     bool checkNewSize(const QSize &size, QSize *clipedSize = nullptr) override;
@@ -132,7 +133,7 @@ public Q_SLOTS:
     void bypassManagerChanged();
     void geometryChanged();
     void windowTypesChanged();
-    void decorationsTypeChanged();
+    void decorationsTypesChanged();
 
     void requestConfigure(QRect geometry, ConfigureFlags flags);
     void requestActivate();