ci: add flake check

core/cmd/dms/commands_screenshot.go

@@ -295,14 +295,7 @@ func bufferToRGBThumbnail(buf *screenshot.ShmBuffer, maxSize int, pixelFormat ui
 
 	data := buf.Data()
 	rgb := make([]byte, dstW*dstH*3)
-
-	var swapRB bool
-	switch pixelFormat {
-	case uint32(screenshot.FormatABGR8888), uint32(screenshot.FormatXBGR8888):
-		swapRB = false
-	default:
-		swapRB = true
-	}
+	swapRB := pixelFormat == uint32(screenshot.FormatARGB8888) || pixelFormat == uint32(screenshot.FormatXRGB8888) || pixelFormat == 0
 
 	for y := 0; y < dstH; y++ {
 		srcY := int(float64(y) / scale)
@@ -316,17 +309,16 @@ func bufferToRGBThumbnail(buf *screenshot.ShmBuffer, maxSize int, pixelFormat ui
 			}
 			si := srcY*buf.Stride + srcX*4
 			di := (y*dstW + x) * 3
-			if si+3 >= len(data) {
-				continue
-			}
-			if swapRB {
-				rgb[di+0] = data[si+2]
-				rgb[di+1] = data[si+1]
-				rgb[di+2] = data[si+0]
-			} else {
-				rgb[di+0] = data[si+0]
-				rgb[di+1] = data[si+1]
-				rgb[di+2] = data[si+2]
+			if si+2 < len(data) {
+				if swapRB {
+					rgb[di+0] = data[si+2]
+					rgb[di+1] = data[si+1]
+					rgb[di+2] = data[si+0]
+				} else {
+					rgb[di+0] = data[si+0]
+					rgb[di+1] = data[si+1]
+					rgb[di+2] = data[si+2]
+				}
 			}
 		}
 	}
@@ -378,37 +370,7 @@ func runScreenshotList(cmd *cobra.Command, args []string) {
 	}
 
 	for _, o := range outputs {
-		scaleStr := fmt.Sprintf("%.2f", o.FractionalScale)
-		if o.FractionalScale == float64(int(o.FractionalScale)) {
-			scaleStr = fmt.Sprintf("%d", int(o.FractionalScale))
-		}
-
-		transformStr := transformName(o.Transform)
-
-		fmt.Printf("%s: %dx%d+%d+%d scale=%s transform=%s\n",
-			o.Name, o.Width, o.Height, o.X, o.Y, scaleStr, transformStr)
-	}
-}
-
-func transformName(t int32) string {
-	switch t {
-	case 0:
-		return "normal"
-	case 1:
-		return "90"
-	case 2:
-		return "180"
-	case 3:
-		return "270"
-	case 4:
-		return "flipped"
-	case 5:
-		return "flipped-90"
-	case 6:
-		return "flipped-180"
-	case 7:
-		return "flipped-270"
-	default:
-		return fmt.Sprintf("%d", t)
+		fmt.Printf("%s: %dx%d+%d+%d (scale: %d)\n",
+			o.Name, o.Width, o.Height, o.X, o.Y, o.Scale)
 	}
 }

core/internal/colorpicker/state.go

@@ -1,7 +1,6 @@
 package colorpicker
 
 import (
-	"fmt"
 	"math"
 	"strings"
 	"sync"
@@ -80,10 +79,6 @@ func (s *SurfaceState) OnScreencopyBuffer(format PixelFormat, width, height, str
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
-	if stride < width*4 {
-		return fmt.Errorf("invalid stride %d for width %d", stride, width)
-	}
-
 	if s.screenBuf != nil {
 		s.screenBuf.Close()
 		s.screenBuf = nil
@@ -284,10 +279,10 @@ func (s *SurfaceState) Redraw() *ShmBuffer {
 	drawMagnifierWithInversion(
 		dst.Data(), dst.Stride, dst.Width, dst.Height,
 		s.screenBuf.Data(), s.screenBuf.Stride, s.screenBuf.Width, s.screenBuf.Height,
-		px, py, picked, s.yInverted, s.screenFormat,
+		px, py, picked, s.yInverted,
 	)
 
-	drawColorPreview(dst.Data(), dst.Stride, dst.Width, dst.Height, px, py, picked, s.displayFormat, s.lowercase, s.screenFormat)
+	drawColorPreview(dst.Data(), dst.Stride, dst.Width, dst.Height, px, py, picked, s.displayFormat, s.lowercase)
 
 	return dst
 }
@@ -395,7 +390,6 @@ func drawMagnifierWithInversion(
 	cx, cy int,
 	borderColor Color,
 	yInverted bool,
-	format PixelFormat,
 ) {
 	if dstW <= 0 || dstH <= 0 || srcW <= 0 || srcH <= 0 {
 		return
@@ -413,14 +407,6 @@ func drawMagnifierWithInversion(
 	innerRadius := float64(outerRadius - borderThickness)
 	outerRadiusF := float64(outerRadius)
 
-	var rOff, bOff int
-	switch format {
-	case FormatABGR8888, FormatXBGR8888:
-		rOff, bOff = 0, 2
-	default:
-		rOff, bOff = 2, 0
-	}
-
 	for dy := -outerRadius - 2; dy <= outerRadius+2; dy++ {
 		y := cy + dy
 		if y < 0 || y >= dstH {
@@ -445,9 +431,9 @@ func drawMagnifierWithInversion(
 			}
 
 			bgColor := Color{
-				R: dst[dstOff+rOff],
+				B: dst[dstOff+0],
 				G: dst[dstOff+1],
-				B: dst[dstOff+bOff],
+				R: dst[dstOff+2],
 				A: dst[dstOff+3],
 			}
 
@@ -476,7 +462,7 @@ func drawMagnifierWithInversion(
 					}
 					srcOff := sy*srcStride + sx*4
 					if srcOff+4 <= len(src) {
-						magColor := Color{R: src[srcOff+rOff], G: src[srcOff+1], B: src[srcOff+bOff], A: 255}
+						magColor := Color{B: src[srcOff+0], G: src[srcOff+1], R: src[srcOff+2], A: 255}
 						finalColor = blendColors(magColor, borderColor, alpha)
 					} else {
 						finalColor = borderColor
@@ -497,25 +483,24 @@ func drawMagnifierWithInversion(
 				}
 				srcOff := sy*srcStride + sx*4
 				if srcOff+4 <= len(src) {
-					finalColor = Color{R: src[srcOff+rOff], G: src[srcOff+1], B: src[srcOff+bOff], A: 255}
+					finalColor = Color{B: src[srcOff+0], G: src[srcOff+1], R: src[srcOff+2], A: 255}
 				} else {
 					continue
 				}
 			}
 
-			dst[dstOff+rOff] = finalColor.R
+			dst[dstOff+0] = finalColor.B
 			dst[dstOff+1] = finalColor.G
-			dst[dstOff+bOff] = finalColor.B
+			dst[dstOff+2] = finalColor.R
 			dst[dstOff+3] = 255
 		}
 	}
 
-	drawMagnifierCrosshair(dst, dstStride, dstW, dstH, cx, cy, int(innerRadius), crossThickness, crossInnerRadius, format)
+	drawMagnifierCrosshair(dst, dstStride, dstW, dstH, cx, cy, int(innerRadius), crossThickness, crossInnerRadius)
 }
 
 func drawMagnifierCrosshair(
 	data []byte, stride, width, height, cx, cy, radius, thickness, innerRadius int,
-	format PixelFormat,
 ) {
 	if width <= 0 || height <= 0 {
 		return
@@ -1013,7 +998,7 @@ var fontGlyphs = map[rune][fontH]uint8{
 	},
 }
 
-func drawColorPreview(data []byte, stride, width, height int, cx, cy int, c Color, format OutputFormat, lowercase bool, pixelFormat PixelFormat) {
+func drawColorPreview(data []byte, stride, width, height int, cx, cy int, c Color, format OutputFormat, lowercase bool) {
 	text := formatColorForPreview(c, format, lowercase)
 	if len(text) == 0 {
 		return
@@ -1048,8 +1033,9 @@ func drawColorPreview(data []byte, stride, width, height int, cx, cy int, c Colo
 		y = height - boxH
 	}
 
-	drawFilledRect(data, stride, width, height, x, y, boxW, boxH, c, pixelFormat)
+	drawFilledRect(data, stride, width, height, x, y, boxW, boxH, c)
 
+	// Use contrasting text color based on luminance
 	lum := 0.299*float64(c.R) + 0.587*float64(c.G) + 0.114*float64(c.B)
 	var fg Color
 	if lum > 128 {
@@ -1057,7 +1043,7 @@ func drawColorPreview(data []byte, stride, width, height int, cx, cy int, c Colo
 	} else {
 		fg = Color{R: 255, G: 255, B: 255, A: 255}
 	}
-	drawText(data, stride, width, height, x+paddingX, y+paddingY, text, fg, pixelFormat)
+	drawText(data, stride, width, height, x+paddingX, y+paddingY, text, fg)
 }
 
 func formatColorForPreview(c Color, format OutputFormat, lowercase bool) string {
@@ -1078,7 +1064,7 @@ func formatColorForPreview(c Color, format OutputFormat, lowercase bool) string
 	}
 }
 
-func drawFilledRect(data []byte, stride, width, height, x, y, w, h int, col Color, format PixelFormat) {
+func drawFilledRect(data []byte, stride, width, height, x, y, w, h int, col Color) {
 	if w <= 0 || h <= 0 {
 		return
 	}
@@ -1087,14 +1073,6 @@ func drawFilledRect(data []byte, stride, width, height, x, y, w, h int, col Colo
 	x = clamp(x, 0, width)
 	y = clamp(y, 0, height)
 
-	var rOff, bOff int
-	switch format {
-	case FormatABGR8888, FormatXBGR8888:
-		rOff, bOff = 0, 2
-	default:
-		rOff, bOff = 2, 0
-	}
-
 	for yy := y; yy < yEnd; yy++ {
 		rowOff := yy * stride
 		for xx := x; xx < xEnd; xx++ {
@@ -1102,34 +1080,26 @@ func drawFilledRect(data []byte, stride, width, height, x, y, w, h int, col Colo
 			if off+4 > len(data) {
 				continue
 			}
-			data[off+rOff] = col.R
+			data[off+0] = col.B
 			data[off+1] = col.G
-			data[off+bOff] = col.B
+			data[off+2] = col.R
 			data[off+3] = 255
 		}
 	}
 }
 
-func drawText(data []byte, stride, width, height, x, y int, text string, col Color, format PixelFormat) {
+func drawText(data []byte, stride, width, height, x, y int, text string, col Color) {
 	for i, r := range text {
-		drawGlyph(data, stride, width, height, x+i*(fontW+2), y, r, col, format)
+		drawGlyph(data, stride, width, height, x+i*(fontW+2), y, r, col)
 	}
 }
 
-func drawGlyph(data []byte, stride, width, height, x, y int, r rune, col Color, format PixelFormat) {
+func drawGlyph(data []byte, stride, width, height, x, y int, r rune, col Color) {
 	g, ok := fontGlyphs[r]
 	if !ok {
 		return
 	}
 
-	var rOff, bOff int
-	switch format {
-	case FormatABGR8888, FormatXBGR8888:
-		rOff, bOff = 0, 2
-	default:
-		rOff, bOff = 2, 0
-	}
-
 	for row := 0; row < fontH; row++ {
 		yy := y + row
 		if yy < 0 || yy >= height {
@@ -1153,9 +1123,9 @@ func drawGlyph(data []byte, stride, width, height, x, y int, r rune, col Color,
 				continue
 			}
 
-			data[off+rOff] = col.R
+			data[off+0] = col.B
 			data[off+1] = col.G
-			data[off+bOff] = col.B
+			data[off+2] = col.R
 			data[off+3] = 255
 		}
 	}

core/internal/screenshot/compositor.go

@@ -7,7 +7,6 @@ import (
 	"os/exec"
 
 	"github.com/AvengeMedia/DankMaterialShell/core/internal/proto/dwl_ipc"
-	"github.com/AvengeMedia/DankMaterialShell/core/internal/proto/wlr_output_management"
 	wlhelpers "github.com/AvengeMedia/DankMaterialShell/core/internal/wayland/client"
 	"github.com/AvengeMedia/DankMaterialShell/core/pkg/go-wayland/wayland/client"
 )
@@ -90,15 +89,12 @@ func SetCompositorDWL() {
 }
 
 type WindowGeometry struct {
-	X               int32
-	Y               int32
-	Width           int32
-	Height          int32
-	Output          string
-	Scale           float64
-	OutputX         int32
-	OutputY         int32
-	OutputTransform int32
+	X      int32
+	Y      int32
+	Width  int32
+	Height int32
+	Output string
+	Scale  float64
 }
 
 func GetActiveWindow() (*WindowGeometry, error) {
@@ -386,92 +382,6 @@ func GetFocusedMonitor() string {
 	return ""
 }
 
-type outputInfo struct {
-	x, y      int32
-	transform int32
-}
-
-func getOutputInfo(outputName string) (*outputInfo, bool) {
-	display, err := client.Connect("")
-	if err != nil {
-		return nil, false
-	}
-	ctx := display.Context()
-	defer ctx.Close()
-
-	registry, err := display.GetRegistry()
-	if err != nil {
-		return nil, false
-	}
-
-	var outputManager *wlr_output_management.ZwlrOutputManagerV1
-
-	registry.SetGlobalHandler(func(e client.RegistryGlobalEvent) {
-		if e.Interface == wlr_output_management.ZwlrOutputManagerV1InterfaceName {
-			mgr := wlr_output_management.NewZwlrOutputManagerV1(ctx)
-			version := e.Version
-			if version > 4 {
-				version = 4
-			}
-			if err := registry.Bind(e.Name, e.Interface, version, mgr); err == nil {
-				outputManager = mgr
-			}
-		}
-	})
-
-	if err := wlhelpers.Roundtrip(display, ctx); err != nil {
-		return nil, false
-	}
-
-	if outputManager == nil {
-		return nil, false
-	}
-
-	type headState struct {
-		name      string
-		x, y      int32
-		transform int32
-	}
-	heads := make(map[*wlr_output_management.ZwlrOutputHeadV1]*headState)
-	done := false
-
-	outputManager.SetHeadHandler(func(e wlr_output_management.ZwlrOutputManagerV1HeadEvent) {
-		state := &headState{}
-		heads[e.Head] = state
-		e.Head.SetNameHandler(func(ne wlr_output_management.ZwlrOutputHeadV1NameEvent) {
-			state.name = ne.Name
-		})
-		e.Head.SetPositionHandler(func(pe wlr_output_management.ZwlrOutputHeadV1PositionEvent) {
-			state.x = pe.X
-			state.y = pe.Y
-		})
-		e.Head.SetTransformHandler(func(te wlr_output_management.ZwlrOutputHeadV1TransformEvent) {
-			state.transform = te.Transform
-		})
-	})
-	outputManager.SetDoneHandler(func(e wlr_output_management.ZwlrOutputManagerV1DoneEvent) {
-		done = true
-	})
-
-	for !done {
-		if err := ctx.Dispatch(); err != nil {
-			return nil, false
-		}
-	}
-
-	for _, state := range heads {
-		if state.name == outputName {
-			return &outputInfo{
-				x:         state.x,
-				y:         state.y,
-				transform: state.transform,
-			}, true
-		}
-	}
-
-	return nil, false
-}
-
 func getDWLActiveWindow() (*WindowGeometry, error) {
 	display, err := client.Connect("")
 	if err != nil {
@@ -599,23 +509,14 @@ func getDWLActiveWindow() (*WindowGeometry, error) {
 		if scale <= 0 {
 			scale = 1.0
 		}
-
-		geom := &WindowGeometry{
+		return &WindowGeometry{
 			X:      state.x,
 			Y:      state.y,
 			Width:  state.w,
 			Height: state.h,
 			Output: state.name,
 			Scale:  scale,
-		}
-
-		if info, ok := getOutputInfo(state.name); ok {
-			geom.OutputX = info.x
-			geom.OutputY = info.y
-			geom.OutputTransform = info.transform
-		}
-
-		return geom, nil
+		}, nil
 	}
 
 	return nil, fmt.Errorf("no active output found")

core/internal/screenshot/encode.go

@@ -20,13 +20,7 @@ func BufferToImageWithFormat(buf *ShmBuffer, format uint32) *image.RGBA {
 	img := image.NewRGBA(image.Rect(0, 0, buf.Width, buf.Height))
 	data := buf.Data()
 
-	var swapRB bool
-	switch format {
-	case uint32(FormatABGR8888), uint32(FormatXBGR8888):
-		swapRB = false
-	default:
-		swapRB = true
-	}
+	swapRB := format == uint32(FormatARGB8888) || format == uint32(FormatXRGB8888) || format == 0
 
 	for y := 0; y < buf.Height; y++ {
 		srcOff := y * buf.Stride

core/internal/screenshot/region.go

@@ -380,21 +380,19 @@ func (r *RegionSelector) preCaptureOutput(output *WaylandOutput, pc *PreCapture,
 		return
 	}
 
-	var capturedBuf *ShmBuffer
-
 	frame.SetBufferHandler(func(e wlr_screencopy.ZwlrScreencopyFrameV1BufferEvent) {
-		if int(e.Stride) < int(e.Width)*4 {
-			log.Error("invalid stride from compositor", "stride", e.Stride, "width", e.Width)
-			return
-		}
 		buf, err := CreateShmBuffer(int(e.Width), int(e.Height), int(e.Stride))
 		if err != nil {
 			log.Error("create screen buffer failed", "err", err)
 			return
 		}
 
-		capturedBuf = buf
-		pc.format = e.Format
+		if withCursor {
+			pc.screenBuf = buf
+			pc.format = e.Format
+		} else {
+			pc.screenBufNoCursor = buf
+		}
 
 		pool, err := r.shm.CreatePool(buf.Fd(), int32(buf.Size()))
 		if err != nil {
@@ -423,34 +421,6 @@ func (r *RegionSelector) preCaptureOutput(output *WaylandOutput, pc *PreCapture,
 
 	frame.SetReadyHandler(func(e wlr_screencopy.ZwlrScreencopyFrameV1ReadyEvent) {
 		frame.Destroy()
-
-		if capturedBuf == nil {
-			onReady()
-			return
-		}
-
-		if pc.yInverted {
-			capturedBuf.FlipVertical()
-			pc.yInverted = false
-		}
-
-		if output.transform != TransformNormal {
-			invTransform := InverseTransform(output.transform)
-			transformed, err := capturedBuf.ApplyTransform(invTransform)
-			if err != nil {
-				log.Error("apply transform failed", "err", err)
-			} else if transformed != capturedBuf {
-				capturedBuf.Close()
-				capturedBuf = transformed
-			}
-		}
-
-		if withCursor {
-			pc.screenBuf = capturedBuf
-		} else {
-			pc.screenBufNoCursor = capturedBuf
-		}
-
 		onReady()
 	})
 

core/internal/screenshot/screenshot.go

@@ -150,33 +150,51 @@ func (s *Screenshoter) captureWindow() (*CaptureResult, error) {
 	case CompositorHyprland:
 		return s.captureAndCrop(output, region)
 	case CompositorDWL:
-		return s.captureDWLWindow(output, region, geom)
+		return s.captureDWLWindow(output, region, geom.Scale)
 	default:
 		return s.captureRegionOnOutput(output, region)
 	}
 }
 
-func (s *Screenshoter) captureDWLWindow(output *WaylandOutput, region Region, geom *WindowGeometry) (*CaptureResult, error) {
+func (s *Screenshoter) captureDWLWindow(output *WaylandOutput, region Region, dwlScale float64) (*CaptureResult, error) {
 	result, err := s.captureWholeOutput(output)
 	if err != nil {
 		return nil, err
 	}
 
-	scale := geom.Scale
-	if scale <= 0 || scale == 1.0 {
-		if output.fractionalScale > 1.0 {
-			scale = output.fractionalScale
-		}
+	scale := dwlScale
+	if scale <= 0 {
+		scale = float64(result.Buffer.Width) / float64(output.width)
 	}
 	if scale <= 0 {
 		scale = 1.0
 	}
 
-	localX := int(float64(region.X-geom.OutputX) * scale)
-	localY := int(float64(region.Y-geom.OutputY) * scale)
+	localX := int(float64(region.X) * scale)
+	localY := int(float64(region.Y) * scale)
+	if localX >= result.Buffer.Width {
+		localX = localX % result.Buffer.Width
+	}
+	if localY >= result.Buffer.Height {
+		localY = localY % result.Buffer.Height
+	}
+
 	w := int(float64(region.Width) * scale)
 	h := int(float64(region.Height) * scale)
 
+	if localY+h > result.Buffer.Height && h <= result.Buffer.Height {
+		localY = result.Buffer.Height - h
+		if localY < 0 {
+			localY = 0
+		}
+	}
+	if localX+w > result.Buffer.Width && w <= result.Buffer.Width {
+		localX = result.Buffer.Width - w
+		if localX < 0 {
+			localX = 0
+		}
+	}
+
 	if localX < 0 {
 		w += localX
 		localX = 0
@@ -324,18 +342,13 @@ func (s *Screenshoter) captureAllScreens() (*CaptureResult, error) {
 
 		outX, outY := output.x, output.y
 		scale := float64(output.scale)
-		switch DetectCompositor() {
-		case CompositorHyprland:
+		if DetectCompositor() == CompositorHyprland {
 			if hx, hy, _, _, ok := GetHyprlandMonitorGeometry(output.name); ok {
 				outX, outY = hx, hy
 			}
 			if s := GetHyprlandMonitorScale(output.name); s > 0 {
 				scale = s
 			}
-		case CompositorDWL:
-			if info, ok := getOutputInfo(output.name); ok {
-				outX, outY = info.x, info.y
-			}
 		}
 		if scale <= 0 {
 			scale = 1.0
@@ -463,42 +476,13 @@ func (s *Screenshoter) captureWholeOutput(output *WaylandOutput) (*CaptureResult
 		return nil, fmt.Errorf("capture output: %w", err)
 	}
 
-	result, err := s.processFrame(frame, Region{
+	return s.processFrame(frame, Region{
 		X:      output.x,
 		Y:      output.y,
 		Width:  output.width,
 		Height: output.height,
 		Output: output.name,
 	})
-	if err != nil {
-		return nil, err
-	}
-
-	if result.YInverted {
-		result.Buffer.FlipVertical()
-		result.YInverted = false
-	}
-
-	if output.transform == TransformNormal {
-		return result, nil
-	}
-
-	invTransform := InverseTransform(output.transform)
-	transformed, err := result.Buffer.ApplyTransform(invTransform)
-	if err != nil {
-		result.Buffer.Close()
-		return nil, fmt.Errorf("apply transform: %w", err)
-	}
-
-	if transformed != result.Buffer {
-		result.Buffer.Close()
-		result.Buffer = transformed
-	}
-
-	result.Region.Width = int32(transformed.Width)
-	result.Region.Height = int32(transformed.Height)
-
-	return result, nil
 }
 
 func (s *Screenshoter) captureAndCrop(output *WaylandOutput, region Region) (*CaptureResult, error) {
@@ -579,10 +563,6 @@ func (s *Screenshoter) captureAndCrop(output *WaylandOutput, region Region) (*Ca
 }
 
 func (s *Screenshoter) captureRegionOnOutput(output *WaylandOutput, region Region) (*CaptureResult, error) {
-	if output.transform != TransformNormal {
-		return s.captureRegionOnTransformedOutput(output, region)
-	}
-
 	scale := output.fractionalScale
 	if scale <= 0 && DetectCompositor() == CompositorHyprland {
 		scale = GetHyprlandMonitorScale(output.name)
@@ -637,76 +617,6 @@ func (s *Screenshoter) captureRegionOnOutput(output *WaylandOutput, region Regio
 	return s.processFrame(frame, region)
 }
 
-func (s *Screenshoter) captureRegionOnTransformedOutput(output *WaylandOutput, region Region) (*CaptureResult, error) {
-	result, err := s.captureWholeOutput(output)
-	if err != nil {
-		return nil, err
-	}
-
-	scale := output.fractionalScale
-	if scale <= 0 && DetectCompositor() == CompositorHyprland {
-		scale = GetHyprlandMonitorScale(output.name)
-	}
-	if scale <= 0 {
-		scale = float64(output.scale)
-	}
-	if scale <= 0 {
-		scale = 1.0
-	}
-
-	localX := int(float64(region.X-output.x) * scale)
-	localY := int(float64(region.Y-output.y) * scale)
-	w := int(float64(region.Width) * scale)
-	h := int(float64(region.Height) * scale)
-
-	if localX < 0 {
-		w += localX
-		localX = 0
-	}
-	if localY < 0 {
-		h += localY
-		localY = 0
-	}
-	if localX+w > result.Buffer.Width {
-		w = result.Buffer.Width - localX
-	}
-	if localY+h > result.Buffer.Height {
-		h = result.Buffer.Height - localY
-	}
-
-	if w <= 0 || h <= 0 {
-		result.Buffer.Close()
-		return nil, fmt.Errorf("region not visible on output")
-	}
-
-	cropped, err := CreateShmBuffer(w, h, w*4)
-	if err != nil {
-		result.Buffer.Close()
-		return nil, fmt.Errorf("create crop buffer: %w", err)
-	}
-
-	srcData := result.Buffer.Data()
-	dstData := cropped.Data()
-
-	for y := 0; y < h; y++ {
-		srcOff := (localY+y)*result.Buffer.Stride + localX*4
-		dstOff := y * cropped.Stride
-		if srcOff+w*4 <= len(srcData) && dstOff+w*4 <= len(dstData) {
-			copy(dstData[dstOff:dstOff+w*4], srcData[srcOff:srcOff+w*4])
-		}
-	}
-
-	result.Buffer.Close()
-	cropped.Format = PixelFormat(result.Format)
-
-	return &CaptureResult{
-		Buffer:    cropped,
-		Region:    region,
-		YInverted: false,
-		Format:    result.Format,
-	}, nil
-}
-
 func (s *Screenshoter) processFrame(frame *wlr_screencopy.ZwlrScreencopyFrameV1, region Region) (*CaptureResult, error) {
 	var buf *ShmBuffer
 	var pool *client.ShmPool
@@ -717,10 +627,6 @@ func (s *Screenshoter) processFrame(frame *wlr_screencopy.ZwlrScreencopyFrameV1,
 	failed := false
 
 	frame.SetBufferHandler(func(e wlr_screencopy.ZwlrScreencopyFrameV1BufferEvent) {
-		if int(e.Stride) < int(e.Width)*4 {
-			log.Error("invalid stride from compositor", "stride", e.Stride, "width", e.Width)
-			return
-		}
 		var err error
 		buf, err = CreateShmBuffer(int(e.Width), int(e.Height), int(e.Stride))
 		if err != nil {
@@ -1018,32 +924,16 @@ func ListOutputs() ([]Output, error) {
 	sc.outputsMu.Lock()
 	defer sc.outputsMu.Unlock()
 
-	compositor := DetectCompositor()
 	result := make([]Output, 0, len(sc.outputs))
 	for _, o := range sc.outputs {
-		out := Output{
-			Name:            o.name,
-			X:               o.x,
-			Y:               o.y,
-			Width:           o.width,
-			Height:          o.height,
-			Scale:           o.scale,
-			FractionalScale: o.fractionalScale,
-			Transform:       o.transform,
-		}
-
-		switch compositor {
-		case CompositorHyprland:
-			if hx, hy, hw, hh, ok := GetHyprlandMonitorGeometry(o.name); ok {
-				out.X, out.Y = hx, hy
-				out.Width, out.Height = hw, hh
-			}
-			if s := GetHyprlandMonitorScale(o.name); s > 0 {
-				out.FractionalScale = s
-			}
-		}
-
-		result = append(result, out)
+		result = append(result, Output{
+			Name:   o.name,
+			X:      o.x,
+			Y:      o.y,
+			Width:  o.width,
+			Height: o.height,
+			Scale:  o.scale,
+		})
 	}
 	return result, nil
 }

core/internal/screenshot/shm.go

@@ -11,23 +11,8 @@ const (
 	FormatXBGR8888 = shm.FormatXBGR8888
 )
 
-const (
-	TransformNormal     = shm.TransformNormal
-	Transform90         = shm.Transform90
-	Transform180        = shm.Transform180
-	Transform270        = shm.Transform270
-	TransformFlipped    = shm.TransformFlipped
-	TransformFlipped90  = shm.TransformFlipped90
-	TransformFlipped180 = shm.TransformFlipped180
-	TransformFlipped270 = shm.TransformFlipped270
-)
-
 type ShmBuffer = shm.Buffer
 
 func CreateShmBuffer(width, height, stride int) (*ShmBuffer, error) {
 	return shm.CreateBuffer(width, height, stride)
 }
-
-func InverseTransform(transform int32) int32 {
-	return shm.InverseTransform(transform)
-}

core/internal/screenshot/types.go

@@ -32,13 +32,11 @@ func (r Region) IsEmpty() bool {
 }
 
 type Output struct {
-	Name            string
-	X, Y            int32
-	Width           int32
-	Height          int32
-	Scale           int32
-	FractionalScale float64
-	Transform       int32
+	Name   string
+	X, Y   int32
+	Width  int32
+	Height int32
+	Scale  int32
 }
 
 type Config struct {

core/internal/server/evdev/manager.go

@@ -306,15 +306,6 @@ func (m *Manager) readAndUpdateCapsLockState(deviceIndex int) {
 		return
 	}
 
-	if len(ledStates) == 0 {
-		log.Debug("No LED state available (empty map)")
-
-		// This means the device either:
-		// - doesn't support LED reporting at all, or
-		// - the kernel returned an empty state
-		return
-	}
-
 	capsLockState := ledStates[ledCapslockKey]
 	m.updateCapsLockStateDirect(capsLockState)
 }

core/internal/wayland/shm/buffer.go

@@ -137,96 +137,3 @@ func (b *Buffer) Clear() {
 func (b *Buffer) CopyFrom(src *Buffer) {
 	copy(b.data, src.data)
 }
-
-const (
-	TransformNormal     = 0
-	Transform90         = 1
-	Transform180        = 2
-	Transform270        = 3
-	TransformFlipped    = 4
-	TransformFlipped90  = 5
-	TransformFlipped180 = 6
-	TransformFlipped270 = 7
-)
-
-func (b *Buffer) ApplyTransform(transform int32) (*Buffer, error) {
-	if transform == TransformNormal {
-		return b, nil
-	}
-
-	var newW, newH int
-	switch transform {
-	case Transform90, Transform270, TransformFlipped90, TransformFlipped270:
-		newW, newH = b.Height, b.Width
-	default:
-		newW, newH = b.Width, b.Height
-	}
-
-	newBuf, err := CreateBuffer(newW, newH, newW*4)
-	if err != nil {
-		return nil, err
-	}
-	newBuf.Format = b.Format
-
-	srcData := b.data
-	dstData := newBuf.data
-
-	for sy := 0; sy < b.Height; sy++ {
-		for sx := 0; sx < b.Width; sx++ {
-			var dx, dy int
-
-			switch transform {
-			case Transform90: // 90° CCW
-				dx = sy
-				dy = b.Width - 1 - sx
-			case Transform180:
-				dx = b.Width - 1 - sx
-				dy = b.Height - 1 - sy
-			case Transform270: // 270° CCW = 90° CW
-				dx = b.Height - 1 - sy
-				dy = sx
-			case TransformFlipped:
-				dx = b.Width - 1 - sx
-				dy = sy
-			case TransformFlipped90:
-				dx = sy
-				dy = sx
-			case TransformFlipped180:
-				dx = sx
-				dy = b.Height - 1 - sy
-			case TransformFlipped270:
-				dx = b.Height - 1 - sy
-				dy = b.Width - 1 - sx
-			default:
-				dx, dy = sx, sy
-			}
-
-			si := sy*b.Stride + sx*4
-			di := dy*newBuf.Stride + dx*4
-
-			if si+3 < len(srcData) && di+3 < len(dstData) {
-				dstData[di+0] = srcData[si+0]
-				dstData[di+1] = srcData[si+1]
-				dstData[di+2] = srcData[si+2]
-				dstData[di+3] = srcData[si+3]
-			}
-		}
-	}
-
-	return newBuf, nil
-}
-
-func InverseTransform(transform int32) int32 {
-	switch transform {
-	case Transform90:
-		return Transform270
-	case Transform270:
-		return Transform90
-	case TransformFlipped90:
-		return TransformFlipped270
-	case TransformFlipped270:
-		return TransformFlipped90
-	default:
-		return transform
-	}
-}

quickshell/DMSShell.qml

@@ -108,14 +108,13 @@ Item {
             id: barRepeaterModel
             values: {
                 const configs = SettingsData.barConfigs;
-                return configs.map(c => ({
-                            id: c.id,
-                            position: c.position
-                        })).sort((a, b) => {
-                    const aVertical = a.position === SettingsData.Position.Left || a.position === SettingsData.Position.Right;
-                    const bVertical = b.position === SettingsData.Position.Left || b.position === SettingsData.Position.Right;
-                    return aVertical - bVertical;
-                });
+                return configs
+                    .map(c => ({ id: c.id, position: c.position }))
+                    .sort((a, b) => {
+                        const aVertical = a.position === SettingsData.Position.Left || a.position === SettingsData.Position.Right;
+                        const bVertical = b.position === SettingsData.Position.Left || b.position === SettingsData.Position.Right;
+                        return aVertical - bVertical;
+                    });
             }
         }
 
@@ -143,34 +142,9 @@ Item {
         }
     }
 
-    property bool dockEnabled: false
-
-    Timer {
-        id: dockRecreateDebounce
-        interval: 500
-        repeat: false
-        onTriggered: {
-            root.dockEnabled = false;
-            Qt.callLater(() => {
-                root.dockEnabled = true;
-            });
-        }
-    }
-
-    Component.onCompleted: {
-        dockRecreateDebounce.start();
-    }
-
-    Connections {
-        target: SettingsData
-        function onBarConfigsChanged() {
-            dockRecreateDebounce.restart();
-        }
-    }
-
     Loader {
         id: dockLoader
-        active: root.dockEnabled
+        active: true
         asynchronous: false
 
         property var currentPosition: SettingsData.dockPosition
@@ -466,71 +440,62 @@ Item {
         title: I18n.tr("Open with...")
 
         function shellEscape(str) {
-            return "'" + str.replace(/'/g, "'\\''") + "'";
+            return "'" + str.replace(/'/g, "'\\''") + "'"
         }
 
         onApplicationSelected: (app, filePath) => {
-            if (!app)
-                return;
-            let cmd = app.exec || "";
-            const escapedPath = shellEscape(filePath);
-            const escapedUri = shellEscape("file://" + filePath);
+            if (!app) return
 
-            let hasField = false;
-            if (cmd.includes("%f")) {
-                cmd = cmd.replace("%f", escapedPath);
-                hasField = true;
-            } else if (cmd.includes("%F")) {
-                cmd = cmd.replace("%F", escapedPath);
-                hasField = true;
-            } else if (cmd.includes("%u")) {
-                cmd = cmd.replace("%u", escapedUri);
-                hasField = true;
-            } else if (cmd.includes("%U")) {
-                cmd = cmd.replace("%U", escapedUri);
-                hasField = true;
-            }
+            let cmd = app.exec || ""
+            const escapedPath = shellEscape(filePath)
+            const escapedUri = shellEscape("file://" + filePath)
 
-            cmd = cmd.replace(/%[ikc]/g, "");
+            let hasField = false
+            if (cmd.includes("%f")) { cmd = cmd.replace("%f", escapedPath); hasField = true }
+            else if (cmd.includes("%F")) { cmd = cmd.replace("%F", escapedPath); hasField = true }
+            else if (cmd.includes("%u")) { cmd = cmd.replace("%u", escapedUri); hasField = true }
+            else if (cmd.includes("%U")) { cmd = cmd.replace("%U", escapedUri); hasField = true }
+
+            cmd = cmd.replace(/%[ikc]/g, "")
 
             if (!hasField) {
-                cmd += " " + escapedPath;
+                cmd += " " + escapedPath
             }
 
-            console.log("FilePicker: Launching", cmd);
+            console.log("FilePicker: Launching", cmd)
 
             Quickshell.execDetached({
                 command: ["sh", "-c", cmd]
-            });
+            })
         }
     }
 
     Connections {
         target: DMSService
         function onOpenUrlRequested(url) {
-            browserPickerModal.url = url;
-            browserPickerModal.open();
+            browserPickerModal.url = url
+            browserPickerModal.open()
         }
 
         function onAppPickerRequested(data) {
-            console.log("DMSShell: App picker requested with data:", JSON.stringify(data));
+            console.log("DMSShell: App picker requested with data:", JSON.stringify(data))
 
             if (!data || !data.target) {
-                console.warn("DMSShell: Invalid app picker request data");
-                return;
+                console.warn("DMSShell: Invalid app picker request data")
+                return
             }
 
-            filePickerModal.targetData = data.target;
-            filePickerModal.targetDataLabel = data.requestType || "file";
+            filePickerModal.targetData = data.target
+            filePickerModal.targetDataLabel = data.requestType || "file"
 
             if (data.categories && data.categories.length > 0) {
-                filePickerModal.categoryFilter = data.categories;
+                filePickerModal.categoryFilter = data.categories
             } else {
-                filePickerModal.categoryFilter = [];
+                filePickerModal.categoryFilter = []
             }
 
-            filePickerModal.usageHistoryKey = "filePickerUsageHistory";
-            filePickerModal.open();
+            filePickerModal.usageHistoryKey = "filePickerUsageHistory"
+            filePickerModal.open()
         }
     }
 

quickshell/Modals/FileBrowser/FileBrowserContent.qml

@@ -46,7 +46,6 @@ FocusScope {
     property bool pathInputHasFocus: false
     property int actualGridColumns: 5
     property bool _initialized: false
-    property bool closeOnEscape: true
 
     signal fileSelected(string path)
     signal closeRequested
@@ -299,7 +298,7 @@ FocusScope {
         property int gridColumns: viewMode === "list" ? 1 : Math.max(1, actualGridColumns)
 
         function handleKey(event) {
-            if (event.key === Qt.Key_Escape && root.closeOnEscape) {
+            if (event.key === Qt.Key_Escape) {
                 closeRequested();
                 event.accepted = true;
                 return;

quickshell/Modals/FileBrowser/FileBrowserModal.qml

@@ -35,7 +35,7 @@ FloatingWindow {
     minimumSize: Qt.size(500, 400)
     implicitWidth: 800
     implicitHeight: 600
-    color: Theme.surfaceContainer
+    color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
     visible: false
 
     onVisibleChanged: {
@@ -59,7 +59,6 @@ FloatingWindow {
         id: content
         anchors.fill: parent
         focus: true
-        closeOnEscape: false
 
         browserTitle: fileBrowserModal.browserTitle
         browserIcon: fileBrowserModal.browserIcon

quickshell/Modals/NotificationModal.qml

@@ -59,7 +59,6 @@ DankModal {
 
     modalWidth: 500
     modalHeight: 700
-    backgroundColor: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
     visible: false
     onBackgroundClicked: hide()
     onOpened: () => {

quickshell/Modals/PolkitAuthModal.qml

@@ -45,7 +45,7 @@ FloatingWindow {
     title: I18n.tr("Authentication")
     minimumSize: Qt.size(420, calculatedHeight)
     maximumSize: Qt.size(420, calculatedHeight)
-    color: Theme.surfaceContainer
+    color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
     visible: false
 
     onVisibleChanged: {

quickshell/Modals/ProcessListModal.qml

@@ -66,7 +66,7 @@ FloatingWindow {
     minimumSize: Qt.size(650, 400)
     implicitWidth: 900
     implicitHeight: 680
-    color: Theme.surfaceContainer
+    color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
     visible: false
 
     onVisibleChanged: {
@@ -112,6 +112,12 @@ FloatingWindow {
         focus: true
 
         Keys.onPressed: event => {
+            if (event.key === Qt.Key_Escape) {
+                hide();
+                event.accepted = true;
+                return;
+            }
+
             switch (event.key) {
             case Qt.Key_1:
                 currentTab = 0;

quickshell/Modals/Settings/SettingsModal.qml

@@ -60,7 +60,7 @@ FloatingWindow {
     minimumSize: Qt.size(500, 400)
     implicitWidth: 800
     implicitHeight: 940
-    color: Theme.surfaceContainer
+    color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
     visible: false
 
     onIsCompactModeChanged: {
@@ -139,6 +139,11 @@ FloatingWindow {
         focus: true
 
         Keys.onPressed: event => {
+            if (event.key === Qt.Key_Escape) {
+                hide();
+                event.accepted = true;
+                return;
+            }
             if (event.key === Qt.Key_Down || (event.key === Qt.Key_Tab && !event.modifiers)) {
                 sidebar.navigateNext();
                 event.accepted = true;

quickshell/Modals/WifiPasswordModal.qml

@@ -191,7 +191,7 @@ FloatingWindow {
     title: isVpnPrompt ? I18n.tr("VPN Password") : I18n.tr("Wi-Fi Password")
     minimumSize: Qt.size(420, calculatedHeight)
     maximumSize: Qt.size(420, calculatedHeight)
-    color: Theme.surfaceContainer
+    color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
     visible: false
 
     onVisibleChanged: {

quickshell/Modules/AppDrawer/AppDrawerPopout.qml

@@ -97,7 +97,7 @@ DankPopout {
 
             property alias searchField: searchField
 
-            color: "transparent"
+            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
             radius: Theme.cornerRadius
             antialiasing: true
             smooth: true

quickshell/Modules/ControlCenter/ControlCenterPopout.qml

@@ -113,7 +113,11 @@ DankPopout {
             implicitHeight: mainColumn.implicitHeight + Theme.spacingM
             property alias bluetoothCodecSelector: bluetoothCodecSelector
 
-            color: "transparent"
+            color: {
+                const transparency = Theme.popupTransparency;
+                const surface = Theme.surfaceContainer || Qt.rgba(0.1, 0.1, 0.1, 1);
+                return Qt.rgba(surface.r, surface.g, surface.b, transparency);
+            }
             radius: Theme.cornerRadius
             border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
             border.width: 0

quickshell/Modules/DankBar/Popouts/BatteryPopout.qml

@@ -1,6 +1,9 @@
 import QtQuick
+import QtQuick.Controls
 import Quickshell
 import Quickshell.Services.UPower
+import Quickshell.Wayland
+import Quickshell.Widgets
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -23,12 +26,13 @@ DankPopout {
     function setProfile(profile) {
         if (typeof PowerProfiles === "undefined") {
             ToastService.showError("power-profiles-daemon not available");
-            return;
+            return ;
         }
         PowerProfiles.profile = profile;
         if (PowerProfiles.profile !== profile) {
             ToastService.showError("Failed to set power profile");
         }
+
     }
 
     popupWidth: 400
@@ -44,7 +48,7 @@ DankPopout {
             id: batteryContent
 
             implicitHeight: contentColumn.implicitHeight + Theme.spacingL * 2
-            color: "transparent"
+            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
             radius: Theme.cornerRadius
             border.color: Theme.outlineMedium
             border.width: 0
@@ -55,8 +59,9 @@ DankPopout {
                 if (root.shouldBeVisible) {
                     forceActiveFocus();
                 }
+
             }
-            Keys.onPressed: function (event) {
+            Keys.onPressed: function(event) {
                 if (event.key === Qt.Key_Escape) {
                     root.close();
                     event.accepted = true;
@@ -66,10 +71,11 @@ DankPopout {
             Connections {
                 function onShouldBeVisibleChanged() {
                     if (root.shouldBeVisible) {
-                        Qt.callLater(function () {
+                        Qt.callLater(function() {
                             batteryContent.forceActiveFocus();
                         });
                     }
+
                 }
 
                 target: root
@@ -240,8 +246,7 @@ DankPopout {
 
                         StyledText {
                             text: {
-                                if (!BatteryService.batteryAvailable)
-                                    return "Power profile management available";
+                                if (!BatteryService.batteryAvailable) return "Power profile management available"
                                 const time = BatteryService.formatTimeRemaining();
                                 if (time !== "Unknown") {
                                     return BatteryService.isCharging ? `Time until full: ${time}` : `Time remaining: ${time}`;
@@ -465,14 +470,14 @@ DankPopout {
                                             StyledText {
                                                 text: {
                                                     if (!modelData.healthSupported || modelData.healthPercentage <= 0)
-                                                        return "N/A";
-                                                    return `${Math.round(modelData.healthPercentage)}%`;
+                                                        return "N/A"
+                                                    return `${Math.round(modelData.healthPercentage)}%`
                                                 }
                                                 font.pixelSize: Theme.fontSizeSmall
                                                 color: {
                                                     if (!modelData.healthSupported || modelData.healthPercentage <= 0)
-                                                        return Theme.surfaceText;
-                                                    return modelData.healthPercentage < 80 ? Theme.error : Theme.surfaceText;
+                                                        return Theme.surfaceText
+                                                    return modelData.healthPercentage < 80 ? Theme.error : Theme.surfaceText
                                                 }
                                                 font.weight: Font.Bold
                                                 anchors.horizontalCenter: parent.horizontalCenter
@@ -521,7 +526,10 @@ DankPopout {
                                             spacing: 2
 
                                             StyledText {
-                                                text: modelData.state === UPowerDeviceState.Charging ? I18n.tr("To Full") : modelData.state === UPowerDeviceState.Discharging ? I18n.tr("Left") : ""
+                                                text: modelData.state === UPowerDeviceState.Charging
+                                                                          ? I18n.tr("To Full")
+                                                                          : modelData.state === UPowerDeviceState.Discharging
+                                                                              ? I18n.tr("Left") : ""
                                                 font.pixelSize: Theme.fontSizeSmall
                                                 color: Theme.surfaceTextMedium
                                                 font.weight: Font.Medium
@@ -530,14 +538,17 @@ DankPopout {
 
                                             StyledText {
                                                 text: {
-                                                    const time = modelData.state === UPowerDeviceState.Charging ? modelData.timeToFull : modelData.state === UPowerDeviceState.Discharging && BatteryService.changeRate > 0 ? (3600 * modelData.energy) / BatteryService.changeRate : 0;
+                                                      const time = modelData.state === UPowerDeviceState.Charging
+                                                                   ? modelData.timeToFull
+                                                                   : modelData.state === UPowerDeviceState.Discharging && BatteryService.changeRate > 0
+                                                                       ? (3600 * modelData.energy) / BatteryService.changeRate : 0
 
                                                     if (!time || time <= 0 || time > 86400)
-                                                        return "N/A";
+                                                        return "N/A"
 
-                                                    const hours = Math.floor(time / 3600);
-                                                    const minutes = Math.floor((time % 3600) / 60);
-                                                    return hours > 0 ? `${hours}h ${minutes}m` : `${minutes}m`;
+                                                    const hours = Math.floor(time / 3600)
+                                                    const minutes = Math.floor((time % 3600) / 60)
+                                                    return hours > 0 ? `${hours}h ${minutes}m` : `${minutes}m`
                                                 }
                                                 font.pixelSize: Theme.fontSizeSmall
                                                 color: Theme.surfaceText
@@ -555,9 +566,8 @@ DankPopout {
                 DankButtonGroup {
                     property var profileModel: (typeof PowerProfiles !== "undefined") ? [PowerProfile.PowerSaver, PowerProfile.Balanced].concat(PowerProfiles.hasPerformanceProfile ? [PowerProfile.Performance] : []) : [PowerProfile.PowerSaver, PowerProfile.Balanced, PowerProfile.Performance]
                     property int currentProfileIndex: {
-                        if (typeof PowerProfiles === "undefined")
-                            return 1;
-                        return profileModel.findIndex(profile => root.isActiveProfile(profile));
+                        if (typeof PowerProfiles === "undefined") return 1
+                        return profileModel.findIndex(profile => root.isActiveProfile(profile))
                     }
 
                     model: profileModel.map(profile => Theme.getPowerProfileLabel(profile))
@@ -565,9 +575,8 @@ DankPopout {
                     selectionMode: "single"
                     anchors.horizontalCenter: parent.horizontalCenter
                     onSelectionChanged: (index, selected) => {
-                        if (!selected)
-                            return;
-                        root.setProfile(profileModel[index]);
+                        if (!selected) return
+                        root.setProfile(profileModel[index])
                     }
                 }
 
@@ -625,4 +634,5 @@ DankPopout {
             }
         }
     }
-}
+
+}

quickshell/Modules/DankBar/Popouts/DWLLayoutPopout.qml

@@ -1,4 +1,8 @@
 import QtQuick
+import QtQuick.Controls
+import Quickshell
+import Quickshell.Wayland
+import Quickshell.Widgets
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -11,31 +15,31 @@ DankPopout {
     property var triggerScreen: null
 
     function setTriggerPosition(x, y, width, section, screen, barPosition, barThickness, barSpacing, barConfig) {
-        triggerX = x;
-        triggerY = y;
-        triggerWidth = width;
-        triggerSection = section;
-        root.screen = screen;
+        triggerX = x
+        triggerY = y
+        triggerWidth = width
+        triggerSection = section
+        root.screen = screen
 
-        storedBarThickness = barThickness !== undefined ? barThickness : (Theme.barHeight - 4);
-        storedBarSpacing = barSpacing !== undefined ? barSpacing : 4;
-        storedBarConfig = barConfig;
+        storedBarThickness = barThickness !== undefined ? barThickness : (Theme.barHeight - 4)
+        storedBarSpacing = barSpacing !== undefined ? barSpacing : 4
+        storedBarConfig = barConfig
 
-        const pos = barPosition !== undefined ? barPosition : 0;
-        const bottomGap = barConfig ? (barConfig.bottomGap !== undefined ? barConfig.bottomGap : 0) : 0;
+        const pos = barPosition !== undefined ? barPosition : 0
+        const bottomGap = barConfig ? (barConfig.bottomGap !== undefined ? barConfig.bottomGap : 0) : 0
 
-        setBarContext(pos, bottomGap);
+        setBarContext(pos, bottomGap)
 
-        updateOutputState();
+        updateOutputState()
     }
 
     onScreenChanged: updateOutputState()
 
     function updateOutputState() {
         if (screen && DwlService.dwlAvailable) {
-            outputState = DwlService.getOutputState(screen.name);
+            outputState = DwlService.getOutputState(screen.name)
         } else {
-            outputState = null;
+            outputState = null
         }
     }
 
@@ -43,56 +47,56 @@ DankPopout {
     property string currentLayoutSymbol: outputState?.layoutSymbol || ""
 
     readonly property var layoutNames: ({
-            "CT": I18n.tr("Center Tiling"),
-            "G": I18n.tr("Grid"),
-            "K": I18n.tr("Deck"),
-            "M": I18n.tr("Monocle"),
-            "RT": I18n.tr("Right Tiling"),
-            "S": I18n.tr("Scrolling"),
-            "T": I18n.tr("Tiling"),
-            "VG": I18n.tr("Vertical Grid"),
-            "VK": I18n.tr("Vertical Deck"),
-            "VS": I18n.tr("Vertical Scrolling"),
-            "VT": I18n.tr("Vertical Tiling")
-        })
+        "CT": I18n.tr("Center Tiling"),
+        "G": I18n.tr("Grid"),
+        "K": I18n.tr("Deck"),
+        "M": I18n.tr("Monocle"),
+        "RT": I18n.tr("Right Tiling"),
+        "S": I18n.tr("Scrolling"),
+        "T": I18n.tr("Tiling"),
+        "VG": I18n.tr("Vertical Grid"),
+        "VK": I18n.tr("Vertical Deck"),
+        "VS": I18n.tr("Vertical Scrolling"),
+        "VT": I18n.tr("Vertical Tiling")
+    })
 
     readonly property var layoutIcons: ({
-            "CT": "view_compact",
-            "G": "grid_view",
-            "K": "layers",
-            "M": "fullscreen",
-            "RT": "view_sidebar",
-            "S": "view_carousel",
-            "T": "view_quilt",
-            "VG": "grid_on",
-            "VK": "view_day",
-            "VS": "scrollable_header",
-            "VT": "clarify"
-        })
+        "CT": "view_compact",
+        "G": "grid_view",
+        "K": "layers",
+        "M": "fullscreen",
+        "RT": "view_sidebar",
+        "S": "view_carousel",
+        "T": "view_quilt",
+        "VG": "grid_on",
+        "VK": "view_day",
+        "VS": "scrollable_header",
+        "VT": "clarify"
+    })
 
     function getLayoutName(symbol) {
-        return layoutNames[symbol] || symbol;
+        return layoutNames[symbol] || symbol
     }
 
     function getLayoutIcon(symbol) {
-        return layoutIcons[symbol] || "view_quilt";
+        return layoutIcons[symbol] || "view_quilt"
     }
 
     Connections {
         target: DwlService
         function onStateChanged() {
-            updateOutputState();
+            updateOutputState()
         }
     }
 
     onShouldBeVisibleChanged: {
         if (shouldBeVisible) {
-            updateOutputState();
+            updateOutputState()
         }
     }
 
     Component.onCompleted: {
-        updateOutputState();
+        updateOutputState()
     }
 
     popupWidth: 300
@@ -107,7 +111,7 @@ DankPopout {
             id: layoutContent
 
             implicitHeight: contentColumn.implicitHeight + Theme.spacingL * 2
-            color: "transparent"
+            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
             radius: Theme.cornerRadius
             border.color: Theme.outlineMedium
             border.width: 0
@@ -117,14 +121,14 @@ DankPopout {
 
             Component.onCompleted: {
                 if (root.shouldBeVisible) {
-                    forceActiveFocus();
+                    forceActiveFocus()
                 }
             }
 
             Keys.onPressed: event => {
                 if (event.key === Qt.Key_Escape) {
-                    root.close();
-                    event.accepted = true;
+                    root.close()
+                    event.accepted = true
                 }
             }
 
@@ -133,8 +137,8 @@ DankPopout {
                 function onShouldBeVisibleChanged() {
                     if (root.shouldBeVisible) {
                         Qt.callLater(() => {
-                            layoutContent.forceActiveFocus();
-                        });
+                            layoutContent.forceActiveFocus()
+                        })
                     }
                 }
             }
@@ -208,7 +212,7 @@ DankPopout {
                             hoverEnabled: true
                             cursorShape: Qt.PointingHandCursor
                             onPressed: {
-                                root.close();
+                                root.close()
                             }
                         }
                     }
@@ -278,14 +282,14 @@ DankPopout {
                                 cursorShape: Qt.PointingHandCursor
                                 onPressed: {
                                     if (!root.triggerScreen) {
-                                        return;
+                                        return
                                     }
                                     if (!DwlService.dwlAvailable) {
-                                        return;
+                                        return
                                     }
 
-                                    DwlService.setLayout(root.triggerScreen.name, index);
-                                    root.close();
+                                    DwlService.setLayout(root.triggerScreen.name, index)
+                                    root.close()
                                 }
                             }
 

quickshell/Modules/DankBar/Popouts/VpnPopout.qml

@@ -36,7 +36,7 @@ DankPopout {
             id: content
 
             implicitHeight: contentColumn.height + Theme.spacingL * 2
-            color: "transparent"
+            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
             radius: Theme.cornerRadius
             border.color: Theme.outlineMedium
             border.width: 0

quickshell/Modules/DankDash/DankDashPopout.qml

@@ -167,7 +167,7 @@ DankPopout {
             id: mainContainer
 
             implicitHeight: contentColumn.height + Theme.spacingM * 2
-            color: "transparent"
+            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
             radius: Theme.cornerRadius
             focus: true
 
@@ -358,8 +358,6 @@ DankPopout {
                                 popoutWidth: root.alignedWidth
                                 popoutHeight: root.alignedHeight
                                 contentOffsetY: Theme.spacingM + 48 + Theme.spacingS + Theme.spacingXS
-                                section: root.triggerSection
-                                barPosition: root.effectiveBarPosition
                                 Component.onCompleted: root.__mediaTabRef = this
                                 onShowVolumeDropdown: (pos, screen, rightEdge, player, players) => {
                                     root.__showVolumeDropdown(pos, rightEdge, player, players);

quickshell/Modules/DankDash/MediaPlayerTab.qml

@@ -3,6 +3,7 @@ import QtQuick.Effects
 import QtQuick.Layouts
 import Quickshell.Services.Mpris
 import Quickshell.Io
+import Quickshell
 import qs.Common
 import qs.Services
 import qs.Widgets
@@ -18,8 +19,6 @@ Item {
     property real popoutWidth: 0
     property real popoutHeight: 0
     property real contentOffsetY: 0
-    property string section: ""
-    property int barPosition: SettingsData.Position.Top
 
     signal showVolumeDropdown(point pos, var screen, bool rightEdge, var player, var players)
     signal showAudioDevicesDropdown(point pos, var screen, bool rightEdge)
@@ -41,13 +40,7 @@ Item {
         id: sharedTooltip
     }
 
-    readonly property bool isRightEdge: {
-        if (barPosition === SettingsData.Position.Right)
-            return true;
-        if (barPosition === SettingsData.Position.Left)
-            return false;
-        return section === "right";
-    }
+    readonly property bool isRightEdge: (SettingsData.barConfigs[0]?.position ?? SettingsData.Position.Top) === SettingsData.Position.Right
     readonly property bool __isChromeBrowser: {
         if (!activePlayer?.identity)
             return false;

quickshell/Modules/Greetd/GreeterContent.qml

@@ -4,7 +4,6 @@ import QtQuick.Controls
 import QtQuick.Effects
 import QtQuick.Layouts
 import Quickshell
-import Quickshell.Hyprland
 import Quickshell.Io
 import Quickshell.Services.Greetd
 import Quickshell.Services.Pam
@@ -36,40 +35,19 @@ Item {
         randomFact = Facts.getRandomFact()
     }
 
-    property bool weatherInitialized: false
-
-    function initWeatherService() {
-        if (weatherInitialized)
-            return
-        if (!GreetdSettings.settingsLoaded)
-            return
-        if (!GreetdSettings.weatherEnabled)
-            return
-
-        weatherInitialized = true
-        WeatherService.addRef()
-        WeatherService.forceRefresh()
-    }
-
-    Connections {
-        target: GreetdSettings
-        function onSettingsLoadedChanged() {
-            if (GreetdSettings.settingsLoaded)
-                initWeatherService()
-        }
-    }
-
     Component.onCompleted: {
         pickRandomFact()
-        initWeatherService()
+        WeatherService.addRef()
 
         if (isPrimaryScreen) {
             sessionListProc.running = true
             applyLastSuccessfulUser()
         }
 
-        if (CompositorService.isHyprland)
+        if (CompositorService.isHyprland) {
             updateHyprlandLayout()
+            hyprlandLayoutUpdateTimer.start()
+        }
     }
 
     function applyLastSuccessfulUser() {
@@ -83,8 +61,10 @@ Item {
     }
 
     Component.onDestruction: {
-        if (weatherInitialized)
-            WeatherService.removeRef()
+        WeatherService.removeRef()
+        if (CompositorService.isHyprland) {
+            hyprlandLayoutUpdateTimer.stop()
+        }
     }
 
     function updateHyprlandLayout() {
@@ -126,16 +106,15 @@ Item {
         }
     }
 
-    Connections {
-        target: CompositorService.isHyprland ? Hyprland : null
-        enabled: CompositorService.isHyprland
-
-        function onRawEvent(event) {
-            if (event.name === "activelayout")
-                updateHyprlandLayout()
-        }
+    Timer {
+        id: hyprlandLayoutUpdateTimer
+        interval: 1000
+        running: false
+        repeat: true
+        onTriggered: updateHyprlandLayout()
     }
 
+
     Connections {
         target: GreetdMemory
         enabled: isPrimaryScreen
@@ -771,13 +750,13 @@ Item {
                 visible: {
                     const keyboardVisible = (CompositorService.isNiri && NiriService.keyboardLayoutNames.length > 1) ||
                                           (CompositorService.isHyprland && hyprlandLayoutCount > 1)
-                    return keyboardVisible && GreetdSettings.weatherEnabled && WeatherService.weather.available
+                    return keyboardVisible && WeatherService.weather.available
                 }
             }
 
             Row {
                 spacing: 6
-                visible: GreetdSettings.weatherEnabled && WeatherService.weather.available
+                visible: WeatherService.weather.available
                 anchors.verticalCenter: parent.verticalCenter
 
                 DankIcon {
@@ -801,7 +780,7 @@ Item {
                 height: 24
                 color: Qt.rgba(255, 255, 255, 0.2)
                 anchors.verticalCenter: parent.verticalCenter
-                visible: GreetdSettings.weatherEnabled && WeatherService.weather.available && (NetworkService.networkStatus !== "disconnected" || BluetoothService.enabled || (AudioService.sink && AudioService.sink.audio) || BatteryService.batteryAvailable)
+                visible: WeatherService.weather.available && (NetworkService.networkStatus !== "disconnected" || BluetoothService.enabled || (AudioService.sink && AudioService.sink.audio) || BatteryService.batteryAvailable)
             }
 
             Row {

quickshell/Modules/Lock/LockScreenContent.qml

@@ -1110,7 +1110,7 @@ Item {
                 DankIcon {
                     name: "vpn_lock"
                     size: Theme.iconSize - 2
-                    color: "white"
+                    color: NetworkService.vpnConnected ? Theme.primary : Qt.rgba(255, 255, 255, 0.5)
                     anchors.verticalCenter: parent.verticalCenter
                     visible: NetworkService.vpnAvailable && NetworkService.vpnConnected
                 }

quickshell/Modules/Notifications/Center/NotificationCenterPopout.qml

@@ -124,7 +124,7 @@ DankPopout {
                 return Math.max(300, Math.min(baseHeight, maxHeight));
             }
 
-            color: "transparent"
+            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
             radius: Theme.cornerRadius
             border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
             border.width: 0

quickshell/Modules/Plugins/PluginPopout.qml

@@ -1,4 +1,5 @@
 import QtQuick
+import Quickshell.Wayland
 import qs.Common
 import qs.Widgets
 
@@ -24,7 +25,7 @@ DankPopout {
             id: popoutContainer
 
             implicitHeight: popoutColumn.implicitHeight + Theme.spacingL * 2
-            color: "transparent"
+            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
             radius: Theme.cornerRadius
             border.width: 0
             antialiasing: true
@@ -33,14 +34,14 @@ DankPopout {
 
             Component.onCompleted: {
                 if (root.shouldBeVisible) {
-                    forceActiveFocus();
+                    forceActiveFocus()
                 }
             }
 
             Keys.onPressed: event => {
                 if (event.key === Qt.Key_Escape) {
-                    root.close();
-                    event.accepted = true;
+                    root.close()
+                    event.accepted = true
                 }
             }
 
@@ -49,8 +50,8 @@ DankPopout {
                 function onShouldBeVisibleChanged() {
                     if (root.shouldBeVisible) {
                         Qt.callLater(() => {
-                            popoutContainer.forceActiveFocus();
-                        });
+                            popoutContainer.forceActiveFocus()
+                        })
                     }
                 }
             }
@@ -69,12 +70,12 @@ DankPopout {
 
                     onLoaded: {
                         if (item && "closePopout" in item) {
-                            item.closePopout = function () {
-                                root.close();
-                            };
+                            item.closePopout = function() {
+                                root.close()
+                            }
                         }
                         if (item) {
-                            root.contentHeight = Qt.binding(() => item.implicitHeight + Theme.spacingS * 2);
+                            root.contentHeight = Qt.binding(() => item.implicitHeight + Theme.spacingS * 2)
                         }
                     }
                 }

quickshell/Modules/ProcessList/ProcessListPopout.qml

@@ -1,5 +1,11 @@
 import QtQuick
+import QtQuick.Controls
+import QtQuick.Effects
 import QtQuick.Layouts
+import Quickshell
+import Quickshell.Io
+import Quickshell.Wayland
+import Quickshell.Widgets
 import qs.Common
 import qs.Modules.ProcessList
 import qs.Services
@@ -51,7 +57,7 @@ DankPopout {
             id: processListContent
 
             radius: Theme.cornerRadius
-            color: "transparent"
+            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
             border.color: Qt.rgba(Theme.outline.r, Theme.outline.g, Theme.outline.b, 0.08)
             border.width: 0
             clip: true
@@ -64,7 +70,7 @@ DankPopout {
                 }
                 processContextMenu.parent = processListContent;
             }
-            Keys.onPressed: event => {
+            Keys.onPressed: (event) => {
                 if (event.key === Qt.Key_Escape) {
                     processListPopout.close();
                     event.accepted = true;
@@ -102,6 +108,7 @@ DankPopout {
                         anchors.centerIn: parent
                         width: parent.width - Theme.spacingM * 2
                     }
+
                 }
 
                 Rectangle {
@@ -117,8 +124,13 @@ DankPopout {
                         anchors.margins: Theme.spacingS
                         contextMenu: processContextMenu
                     }
+
                 }
+
             }
+
         }
+
     }
+
 }

quickshell/Modules/Settings/PluginBrowser.qml

@@ -106,7 +106,7 @@ FloatingWindow {
     minimumSize: Qt.size(450, 400)
     implicitWidth: 600
     implicitHeight: 650
-    color: Theme.surfaceContainer
+    color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
     visible: false
 
     onVisibleChanged: {
@@ -537,7 +537,7 @@ FloatingWindow {
         title: I18n.tr("Third-Party Plugin Warning")
         implicitWidth: 500
         implicitHeight: 350
-        color: Theme.surfaceContainer
+        color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
         visible: false
 
         FocusScope {

quickshell/Modules/Settings/WidgetSelectionPopup.qml

@@ -93,7 +93,7 @@ FloatingWindow {
     minimumSize: Qt.size(400, 350)
     implicitWidth: 500
     implicitHeight: 550
-    color: Theme.surfaceContainer
+    color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
     visible: false
 
     onVisibleChanged: {

quickshell/Modules/SystemUpdatePopout.qml

@@ -36,7 +36,7 @@ DankPopout {
         Rectangle {
             id: updaterPanel
 
-            color: "transparent"
+            color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
             radius: Theme.cornerRadius
             antialiasing: true
             smooth: true

quickshell/Services/WeatherService.qml

@@ -5,7 +5,6 @@ import QtQuick
 import Quickshell
 import Quickshell.Io
 import qs.Common
-import qs.Modules.Greetd
 import "../Common/suncalc.js" as SunCalc
 
 Singleton {
@@ -510,29 +509,27 @@ Singleton {
     }
 
     function updateLocation() {
-        const useAuto = SessionData.isGreeterMode ? GreetdSettings.useAutoLocation : SettingsData.useAutoLocation;
-        const coords = SessionData.isGreeterMode ? GreetdSettings.weatherCoordinates : SettingsData.weatherCoordinates;
-        const cityName = SessionData.isGreeterMode ? GreetdSettings.weatherLocation : SettingsData.weatherLocation;
-
-        if (useAuto) {
+        if (SettingsData.useAutoLocation) {
             getLocationFromIP();
-            return;
-        }
-
-        if (coords) {
-            const parts = coords.split(",");
-            if (parts.length === 2) {
-                const lat = parseFloat(parts[0]);
-                const lon = parseFloat(parts[1]);
-                if (!isNaN(lat) && !isNaN(lon)) {
-                    getLocationFromCoords(lat, lon);
-                    return;
+        } else {
+            const coords = SettingsData.weatherCoordinates;
+            if (coords) {
+                const parts = coords.split(",");
+                if (parts.length === 2) {
+                    const lat = parseFloat(parts[0]);
+                    const lon = parseFloat(parts[1]);
+                    if (!isNaN(lat) && !isNaN(lon)) {
+                        getLocationFromCoords(lat, lon);
+                        return;
+                    }
                 }
             }
-        }
 
-        if (cityName)
-            getLocationFromCity(cityName);
+            const cityName = SettingsData.weatherLocation;
+            if (cityName) {
+                getLocationFromCity(cityName);
+            }
+        }
     }
 
     function getLocationFromCoords(lat, lon) {
@@ -870,7 +867,7 @@ Singleton {
     Timer {
         id: updateTimer
         interval: nextInterval()
-        running: root.refCount > 0 && SettingsData.weatherEnabled && !SessionData.isGreeterMode
+        running: root.refCount > 0 && SettingsData.weatherEnabled
         repeat: true
         triggeredOnStart: true
         onTriggered: {

quickshell/Widgets/DankFlickable.qml

@@ -46,12 +46,11 @@ Flickable {
             lastWheelTime = currentTime;
 
             const hasPixel = event.pixelDelta && event.pixelDelta.y !== 0;
+            const hasAngle = event.angleDelta && event.angleDelta.y !== 0;
             const deltaY = event.angleDelta.y;
-            const isTraditionalMouse = !hasPixel && Math.abs(deltaY) >= 120 && (Math.abs(deltaY) % 120) === 0;
-            const isHighDpiMouse = !hasPixel && !isTraditionalMouse && deltaY !== 0;
-            const isTouchpad = hasPixel;
+            const isMouseWheel = !hasPixel && hasAngle;
 
-            if (isTraditionalMouse) {
+            if (isMouseWheel) {
                 sessionUsedMouseWheel = true;
                 momentumTimer.stop();
                 flickable.isMomentumActive = false;
@@ -59,7 +58,7 @@ Flickable {
                 momentum = 0;
                 flickable.momentumVelocity = 0;
 
-                const lines = Math.round(Math.abs(deltaY) / 120);
+                const lines = Math.floor(Math.abs(deltaY) / 120);
                 const scrollAmount = (deltaY > 0 ? -lines : lines) * flickable.mouseWheelSpeed;
                 let newY = flickable.contentY + scrollAmount;
                 newY = Math.max(0, Math.min(flickable.contentHeight - flickable.height, newY));
@@ -69,29 +68,17 @@ Flickable {
                 }
 
                 flickable.contentY = newY;
-            } else if (isHighDpiMouse) {
-                sessionUsedMouseWheel = true;
-                momentumTimer.stop();
-                flickable.isMomentumActive = false;
-                velocitySamples = [];
-                momentum = 0;
-                flickable.momentumVelocity = 0;
-
-                let delta = deltaY / 8 * touchpadSpeed;
-                let newY = flickable.contentY - delta;
-                newY = Math.max(0, Math.min(flickable.contentHeight - flickable.height, newY));
-
-                if (flickable.flicking) {
-                    flickable.cancelFlick();
-                }
-
-                flickable.contentY = newY;
-            } else if (isTouchpad) {
+            } else {
                 sessionUsedMouseWheel = false;
                 momentumTimer.stop();
                 flickable.isMomentumActive = false;
 
-                let delta = event.pixelDelta.y * touchpadSpeed;
+                let delta = 0;
+                if (event.pixelDelta.y !== 0) {
+                    delta = event.pixelDelta.y * touchpadSpeed;
+                } else {
+                    delta = event.angleDelta.y / 8 * touchpadSpeed;
+                }
 
                 velocitySamples.push({
                     "delta": delta,
@@ -107,7 +94,7 @@ Flickable {
                     }
                 }
 
-                if (timeDelta < 50) {
+                if (event.pixelDelta.y !== 0 && timeDelta < 50) {
                     momentum = momentum * momentumRetention + delta * 0.15;
                     delta += momentum;
                 } else {

quickshell/Widgets/DankGridView.qml

@@ -50,12 +50,11 @@ GridView {
             lastWheelTime = currentTime;
 
             const hasPixel = event.pixelDelta && event.pixelDelta.y !== 0;
+            const hasAngle = event.angleDelta && event.angleDelta.y !== 0;
             const deltaY = event.angleDelta.y;
-            const isTraditionalMouse = !hasPixel && Math.abs(deltaY) >= 120 && (Math.abs(deltaY) % 120) === 0;
-            const isHighDpiMouse = !hasPixel && !isTraditionalMouse && deltaY !== 0;
-            const isTouchpad = hasPixel;
+            const isMouseWheel = !hasPixel && hasAngle;
 
-            if (isTraditionalMouse) {
+            if (isMouseWheel) {
                 sessionUsedMouseWheel = true;
                 momentumTimer.stop();
                 isMomentumActive = false;
@@ -63,7 +62,7 @@ GridView {
                 momentum = 0;
                 momentumVelocity = 0;
 
-                const lines = Math.round(Math.abs(deltaY) / 120);
+                const lines = Math.floor(Math.abs(deltaY) / 120);
                 const scrollAmount = (deltaY > 0 ? -lines : lines) * cellHeight * 0.35;
                 let newY = contentY + scrollAmount;
                 newY = Math.max(0, Math.min(contentHeight - height, newY));
@@ -73,29 +72,12 @@ GridView {
                 }
 
                 contentY = newY;
-            } else if (isHighDpiMouse) {
-                sessionUsedMouseWheel = true;
-                momentumTimer.stop();
-                isMomentumActive = false;
-                velocitySamples = [];
-                momentum = 0;
-                momentumVelocity = 0;
-
-                let delta = deltaY / 120 * cellHeight * 1.2;
-                let newY = contentY - delta;
-                newY = Math.max(0, Math.min(contentHeight - height, newY));
-
-                if (flicking) {
-                    cancelFlick();
-                }
-
-                contentY = newY;
-            } else if (isTouchpad) {
+            } else {
                 sessionUsedMouseWheel = false;
                 momentumTimer.stop();
                 isMomentumActive = false;
 
-                let delta = event.pixelDelta.y * touchpadSpeed;
+                let delta = event.pixelDelta.y !== 0 ? event.pixelDelta.y * touchpadSpeed : event.angleDelta.y / 120 * cellHeight * 1.2;
 
                 velocitySamples.push({
                     "delta": delta,
@@ -111,7 +93,7 @@ GridView {
                     }
                 }
 
-                if (timeDelta < 50) {
+                if (event.pixelDelta.y !== 0 && timeDelta < 50) {
                     momentum = momentum * momentumRetention + delta * 0.15;
                     delta += momentum;
                 } else {

quickshell/Widgets/DankListView.qml

@@ -69,12 +69,11 @@ ListView {
             lastWheelTime = currentTime;
 
             const hasPixel = event.pixelDelta && event.pixelDelta.y !== 0;
+            const hasAngle = event.angleDelta && event.angleDelta.y !== 0;
             const deltaY = event.angleDelta.y;
-            const isTraditionalMouse = !hasPixel && Math.abs(deltaY) >= 120 && (Math.abs(deltaY) % 120) === 0;
-            const isHighDpiMouse = !hasPixel && !isTraditionalMouse && deltaY !== 0;
-            const isTouchpad = hasPixel;
+            const isMouseWheel = !hasPixel && hasAngle;
 
-            if (isTraditionalMouse) {
+            if (isMouseWheel) {
                 sessionUsedMouseWheel = true;
                 momentumTimer.stop();
                 isMomentumActive = false;
@@ -82,7 +81,7 @@ ListView {
                 momentum = 0;
                 momentumVelocity = 0;
 
-                const lines = Math.round(Math.abs(deltaY) / 120);
+                const lines = Math.floor(Math.abs(deltaY) / 120);
                 const scrollAmount = (deltaY > 0 ? -lines : lines) * mouseWheelSpeed;
                 let newY = listView.contentY + scrollAmount;
                 const maxY = Math.max(0, listView.contentHeight - listView.height + listView.originY);
@@ -94,31 +93,17 @@ ListView {
 
                 listView.contentY = newY;
                 savedY = newY;
-            } else if (isHighDpiMouse) {
-                sessionUsedMouseWheel = true;
-                momentumTimer.stop();
-                isMomentumActive = false;
-                velocitySamples = [];
-                momentum = 0;
-                momentumVelocity = 0;
-
-                let delta = deltaY / 8 * touchpadSpeed;
-                let newY = listView.contentY - delta;
-                const maxY = Math.max(0, listView.contentHeight - listView.height + listView.originY);
-                newY = Math.max(listView.originY, Math.min(maxY, newY));
-
-                if (listView.flicking) {
-                    listView.cancelFlick();
-                }
-
-                listView.contentY = newY;
-                savedY = newY;
-            } else if (isTouchpad) {
+            } else {
                 sessionUsedMouseWheel = false;
                 momentumTimer.stop();
                 isMomentumActive = false;
 
-                let delta = event.pixelDelta.y * touchpadSpeed;
+                let delta = 0;
+                if (event.pixelDelta.y !== 0) {
+                    delta = event.pixelDelta.y * touchpadSpeed;
+                } else {
+                    delta = event.angleDelta.y / 8 * touchpadSpeed;
+                }
 
                 velocitySamples.push({
                     "delta": delta,
@@ -134,7 +119,7 @@ ListView {
                     }
                 }
 
-                if (timeDelta < 50) {
+                if (event.pixelDelta.y !== 0 && timeDelta < 50) {
                     momentum = momentum * 0.92 + delta * 0.15;
                     delta += momentum;
                 } else {

quickshell/Widgets/DankPopout.qml

@@ -396,6 +396,7 @@ Item {
                 Item {
                     id: bgShadowLayer
                     anchors.fill: parent
+                    visible: contentWrapper.popupSurfaceAlpha >= 0.95
                     layer.enabled: Quickshell.env("DMS_DISABLE_LAYER") !== "true" && Quickshell.env("DMS_DISABLE_LAYER") !== "1"
                     layer.smooth: false
                     layer.textureSize: Qt.size(Math.round(width * root.dpr), Math.round(height * root.dpr))
@@ -420,7 +421,6 @@ Item {
                     DankRectangle {
                         anchors.fill: parent
                         radius: Theme.cornerRadius
-                        color: Theme.withAlpha(Theme.surfaceContainer, Theme.popupTransparency)
                     }
                 }