feat: add screen type detection and adjust floating window logic

Author: WeissP

src/Utils.hs

@@ -41,8 +41,6 @@ toggleFloat w =
 (^=?) :: (Eq a) => Query [a] -> [a] -> Query Bool
 q ^=? x = L.isPrefixOf x <$> q
 
-
-
 -- receive one sperate and three funs to format count, focused window and unfocused window
 myLogTitles ::
   String ->
@@ -100,15 +98,38 @@ logWinCount :: X Int
 logWinCount = length . W.index . windowset <$> get
 
 logIsVerticalScreen :: X Bool
-logIsVerticalScreen = curScreenId <&> isScreenVertical
-
-trimPrefixWithList :: [String] ->  String ->  String
+logIsVerticalScreen = do
+  rect <- logFocusedScreenRect
+  return $ rect_height rect > rect_width rect
+
+data ScreenType = Screen1080p | Screen2K | ScreenUltraWide
+  deriving (Show, Eq)
+
+-- | Determine screen type based on physical dimensions and aspect ratio
+logScreenType :: X ScreenType
+logScreenType = do
+  rect <- logFocusedScreenRect
+  isVertical <- logIsVerticalScreen
+  let (w, h) =
+        if isVertical
+          then (rect_height rect, rect_width rect)
+          else (rect_width rect, rect_height rect)
+      aspectRatio = (fromIntegral w :: Double) / fromIntegral h
+  return $
+    if aspectRatio > 2.0
+      then ScreenUltraWide
+      else
+        if w > 2560 -- 2K width threshold
+          then Screen2K
+          else Screen1080p
+
+trimPrefixWithList :: [String] -> String -> String
 -- trimPrefixWithList _ Nothing = Nothing
 trimPrefixWithList xs s = case mapMaybe (`L.stripPrefix` s) xs of
-  [] ->  s
+  [] -> s
   n : _ -> trimPrefixWithList xs n
 
-trimLayoutModifiers ::  String ->  String
+trimLayoutModifiers :: String -> String
 trimLayoutModifiers = trimPrefixWithList ["Spacing", " "]
 
 isMaster :: W.StackSet i l a s sd -> Bool

src/WeissScratchpad.hs

@@ -72,18 +72,16 @@ niceFloating = do
   isM <- liftX logMaster
   layout <- liftX logLayout <&> fmap trimLayoutModifiers
   c <- liftX logWinCount <&> (\c -> c - 1) -- exclude the NSP window
-  doRectFloat $ case (isV, isM, layout) of
-    (False, False, Just l)
+  screenType <- liftX logScreenType
+  doRectFloat $ case (isV, isM, layout, screenType) of
+    (False, False, Just l, _)
       | c == 3 && "ThreeCol" `isInfixOf` l -> r (33 / 100) (6 / 50) (32 / 100) (25 / 50)
-    (False, False, Just l)
+    (False, False, Just l, _)
       | c == 2 && "ThreeCol" `isInfixOf` l ->
           r (1 / 100) (6 / 50) (30 / 100) (25 / 50)
-    (False, _, _) -> r (66 / 100) (6 / 50) (33 / 100) (25 / 50)
-    -- (_, Just "StackTile") -> r (1 / 50) (26 / 50) (45 / 50) (20 / 50)
-    -- (True, Just "Mirror Tall") -> r (1 / 50) (26 / 50) (45 / 50) (20 / 50)
-    -- (False, Just "Mirror Tall") -> r (1 / 50) (5 / 50) (45 / 50) (20 / 50)
-    (True, True, _) -> r (1 / 50) (26 / 50) (46 / 50) (20 / 50)
-    (True, False, _) -> r (1 / 50) (3 / 50) (46 / 50) (20 / 50)
+    (False, _, _, _) -> r (66 / 100) (6 / 50) (33 / 100) (25 / 50)
+    (True, True, _, _) -> r (1 / 50) (26 / 50) (46 / 50) (20 / 50)
+    (True, False, _, _) -> r (1 / 50) (3 / 50) (46 / 50) (20 / 50)
 
 newtype CurrentScratchpadName = CurrentScratchpadName String
 instance ExtensionClass CurrentScratchpadName where