Revert "feat: add LayerOSD to dispaly notification on lock"

This reverts commit b70974e.

Author: 18202781743

frame/layershell/dlayershellwindow.h

@@ -34,7 +34,6 @@ class DS_SHARE DLayerShellWindow : public QObject
 public:
     ~DLayerShellWindow() override;
 
-    // clang-format off
     /**
      * This enum type is used to specify the position where to anchor
      */
@@ -57,8 +56,6 @@ class DS_SHARE DLayerShellWindow : public QObject
         LayerButtom     = 1,
         LayerTop        = 2,
         LayerOverlay    = 3,
-        LayerExtension  = 8,
-        LayerOSD
     };
 
     Q_ENUM(Layer)
@@ -86,7 +83,6 @@ class DS_SHARE DLayerShellWindow : public QObject
     };
 
     Q_ENUM(KeyboardInteractivity)
-    // clang-format on
 
     void setAnchors(Anchors anchor);
     Anchors anchors() const;

frame/layershell/qwaylandlayershellsurface.cpp

@@ -45,11 +45,11 @@ QWaylandLayerShellSurface::QWaylandLayerShellSurface(QtWayland::zwlr_layer_shell
         }
     }
 
-    init(shell->get_layer_surface(window->waylandSurface()->object(), output, shellLayer(), m_dlayerShellWindow->scope()));
+    init(shell->get_layer_surface(window->waylandSurface()->object(), output, m_dlayerShellWindow->layer(), m_dlayerShellWindow->scope()));
 
-    set_layer(shellLayer());
-    connect(m_dlayerShellWindow, &DLayerShellWindow::layerChanged, this, [this, window]() {
-        set_layer(shellLayer());
+    set_layer(m_dlayerShellWindow->layer());
+    connect(m_dlayerShellWindow, &DLayerShellWindow::layerChanged, this, [this, window](){
+        set_layer(m_dlayerShellWindow->layer());
         window->waylandSurface()->commit();
     });
 
@@ -125,15 +125,6 @@ void QWaylandLayerShellSurface::trySetAnchorsAndSize()
     }
 }
 
-DLayerShellWindow::Layer QWaylandLayerShellSurface::shellLayer() const
-{
-    const auto layer = m_dlayerShellWindow->layer();
-    if (layer >= DLayerShellWindow::LayerExtension)
-        return DLayerShellWindow::LayerOverlay;
-
-    return layer;
-}
-
 void QWaylandLayerShellSurface::zwlr_layer_surface_v1_configure(uint32_t serial, uint32_t width, uint32_t height)
 {
     ack_configure(serial);

frame/layershell/qwaylandlayershellsurface_p.h

@@ -36,7 +36,6 @@ class QWaylandLayerShellSurface : public QtWaylandClient::QWaylandShellSurface,
     void calcAndSetRequestSize(QSize requestSize);
     bool anchorsSizeConflict() const;
     void trySetAnchorsAndSize();
-    DLayerShellWindow::Layer shellLayer() const;
 
     DLayerShellWindow* m_dlayerShellWindow;
     QSize m_pendingSize;

frame/layershell/x11dlayershellemulation.cpp

@@ -105,12 +105,6 @@ void LayerShellEmulation::onLayerChanged()
             xcbWindow->setWindowType(QNativeInterface::Private::QXcbWindow::Notification);
             break;
         }
-        case DLayerShellWindow::LayerOSD: {
-            // FIXME: To display on top of lock for notification.
-            m_window->setFlags(m_window->flags() & ~Qt::WindowStaysOnBottomHint | Qt::X11BypassWindowManagerHint | Qt::WindowStaysOnTopHint);
-            QObject::connect(m_window, &QWindow::visibleChanged, this, &LayerShellEmulation::doRaiseWindow, Qt::UniqueConnection);
-            break;
-        }
     }
 }
 
@@ -235,13 +229,6 @@ void LayerShellEmulation::onExclusionZoneChanged()
     xcb_ewmh_set_wm_strut_partial(&ewmh_connection, m_window->winId(), strut_partial);
 }
 
-void LayerShellEmulation::doRaiseWindow()
-{
-    if (m_window && m_window->isVisible()) {
-        m_window->raise();
-    }
-}
-
 // void X11Emulation::onKeyboardInteractivityChanged()
 // {
 //     // kwin no implentation on wayland

frame/layershell/x11dlayershellemulation.h

@@ -27,7 +27,6 @@ private slots:
     void onPositionChanged();
     void onExclusionZoneChanged();
     // void onKeyboardInteractivityChanged();
-    void doRaiseWindow();
 
 private:
     QWindow* m_window;