Export the WindowData type from WorkspaceHUD

taffybar · May 31, 2017 · 3789e35 · 3789e35
1 parent 47495ed
commit 3789e35
Showing 1 changed file with 19 additions and 13 deletions.
diff --git a/src/System/Taffybar/WorkspaceHUD.hs b/src/System/Taffybar/WorkspaceHUD.hs
@@ -14,11 +14,12 @@
 module System.Taffybar.WorkspaceHUD (
   IconInfo(..),
   WWC(..),
+  WindowData(..),
   Workspace(..),
-  WorkspaceContentsController(..),
   WorkspaceButtonController(..),
-  WorkspaceUnderlineController(..),
+  WorkspaceContentsController(..),
   WorkspaceHUDConfig(..),
+  WorkspaceUnderlineController(..),
   WorkspaceWidgetController(..),
   buildBorderButtonController,
   buildButtonController,
@@ -636,17 +637,22 @@ windowTitleClassIconGetter
   -> (String -> String -> IconInfo)
   -> (WindowData -> HUDIO IconInfo)
 windowTitleClassIconGetter preferCustom customIconF = fn
-    where fn w@WindowData { windowTitle = wTitle
-                              , windowClass = wClass
-                              } =
-            do
-              let customResult = customIconF wTitle wClass
-              defaultResult <- defaultGetIconInfo w
-              let first = if preferCustom then customResult else defaultResult
-              let second = if preferCustom then defaultResult else customResult
-              return $ case first of
-                         IINone -> second
-                         _ -> first
+  where
+    fn w@WindowData {windowTitle = wTitle, windowClass = wClass} = do
+      let customResult = customIconF wTitle wClass
+      defaultResult <- defaultGetIconInfo w
+      let first =
+            if preferCustom
+              then customResult
+              else defaultResult
+      let second =
+            if preferCustom
+              then defaultResult
+              else customResult
+      return $
+        case first of
+          IINone -> second
+          _ -> first
 
 updateImages :: WorkspaceContentsController -> Workspace -> HUDIO [IconWidget]
 updateImages wcc ws = do