Merge branch '2.1'

KDAB · Jul 16, 2024 · d869032 · d869032
2 parents cabdd8d + d8bd729
commit d869032
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/Changelog b/Changelog
@@ -4,7 +4,7 @@
   - Allow to redock back to a floating window (#280)
 
 * v2.1.1 (unreleased)
-  -
+  - Fix windows having transparency when drop indicators inhibited
 
 * v2.1.0 (08 May 2024)
   - Added standalone layouting example using Slint

diff --git a/src/core/WindowBeingDragged.cpp b/src/core/WindowBeingDragged.cpp
@@ -69,7 +69,9 @@ WindowBeingDragged::WindowBeingDragged(FloatingWindow *fw, Draggable *draggable)
     , m_guard(m_draggableView)
 {
     init();
-    updateTransparency(/*enable=*/true);
+
+    // Dragged windows normally have transparency, unless we don't have drop indicators
+    updateTransparency(/*enable=*/!Config::self().dropIndicatorsInhibited());
 }
 
 WindowBeingDragged::WindowBeingDragged(Draggable *draggable)

diff --git a/tests/wayland/CMakeLists.txt b/tests/wayland/CMakeLists.txt
@@ -47,4 +47,4 @@ function(add_wayland_test test srcs)
     )
 endfunction()
 
-add_wayland_test(tst_wayland_qtwidgets tst_qtwidgets.cpp)
+add_wayland_test(tst_wayland_qtwidgets tst_wayland.cpp)