Rebase and adapt to changes in master

2022-04-04 14:37:34 +02:00 · 2022-04-04 14:37:34 +02:00 · 5cf2e1e84d
commit 5cf2e1e84d
parent a0f456b7dc
3 changed files with 11 additions and 1 deletions
--- a/src/effects/CMakeLists.txt
+++ b/src/effects/CMakeLists.txt
@ -86,7 +86,6 @@ add_subdirectory(slideback)
 add_subdirectory(slidingpopups)
 add_subdirectory(thumbnailaside)
 add_subdirectory(touchpoints)
-add_subdirectory(windowgeometry)
 add_subdirectory(windowview)
 add_subdirectory(zoom)

--- a/src/effects/private/qml/WindowHeap.qml
+++ b/src/effects/private/qml/WindowHeap.qml
@ -247,6 +247,7 @@ FocusScope {
                        PropertyChanges {
                            target: closeButton
                            opacity: 1
+                        }
                    },
                    State {
                        name: "active-hidden"
--- a/src/effects/windowview/CMakeLists.txt
+++ b/src/effects/windowview/CMakeLists.txt
@ -11,4 +11,14 @@ qt_add_dbus_adaptor(windowview_SOURCES org.kde.KWin.Effect.WindowView1.xml windo

 kwin4_add_effect_module(kwin4_effect_windowview ${windowview_SOURCES})

+target_link_libraries(kwin4_effect_windowview PRIVATE
+    kwineffects
+    
+    KF5::ConfigGui
+    KF5::GlobalAccel
+    KF5::I18n
+
+    Qt::Quick
+    )
+
 install(DIRECTORY qml DESTINATION ${KDE_INSTALL_DATADIR}/kwin/effects/windowview)