tianbar 1.1.0.0 → 1.1.0.1

raw patch · 5 files changed

+25/−20 lines, 5 files

Files

• scripts/network.js +1/−0
• src/System/Tianbar.hs +7/−6
• src/System/Tianbar/StrutProperties.hs +4/−3
• src/System/Tianbar/WebKit.hs +12/−10
• tianbar.cabal +1/−1

@@ -27,6 +27,7 @@    const ConnectionType = {     WiFi: '802-11-wireless',+    VPN: 'vpn',     // TODO: More types   }; 

@@ -1,5 +1,6 @@ module System.Tianbar where +import Data.GI.Base import qualified Data.Text as T  import GI.Gdk.Enums hiding (WindowTypeToplevel)@@ -23,9 +24,9 @@  topStrut :: Rectangle -> IO StrutProperties topStrut rect = do-    mX <- rectangleReadX rect-    mY <- rectangleReadY rect-    mW <- rectangleReadWidth rect+    mX <- get rect rectangleX+    mY <- get rect rectangleY+    mW <- get rect rectangleWidth     let x = fromIntegral mX         w = fromIntegral mW - 1         h = barHeight + fromIntegral mY@@ -38,9 +39,9 @@     screen <- displayGetDefaultScreen disp     monitorSize <- screenGetMonitorGeometry screen (fromIntegral myMonitor) -    monitorX <- rectangleReadX monitorSize-    monitorY <- rectangleReadY monitorSize-    monitorW <- rectangleReadWidth monitorSize+    monitorX <- get monitorSize rectangleX+    monitorY <- get monitorSize rectangleY+    monitorW <- get monitorSize rectangleWidth      let windowX = monitorX     let windowY = monitorY

@@ -9,7 +9,8 @@  import qualified GI.Gtk as Gtk -import GI.Gdk.Types+import GI.Gdk.Enums+import GI.Gdk.Objects.Window import GI.Gdk.Structs.Atom  import Foreign@@ -29,8 +30,8 @@   propertyChange ::-    (MonadIO m, WindowK a, Storable d) =>-    a                                       -- window+    (MonadIO m, Storable d) =>+    Window                                  -- window     -> Atom                                 -- property     -> Atom                                 -- type_     -> Int32                                -- format

@@ -80,17 +80,19 @@             wprop <- webViewGetWindowProperties nwk             Just wgeom <- getWindowPropertiesGeometry wprop -            [wx, wy, ww, wh] <- mapM ($ wgeom) [ rectangleReadX-                                               , rectangleReadY-                                               , rectangleReadWidth-                                               , rectangleReadHeight-                                               ]+            wx <- get wgeom rectangleX+            wy <- get wgeom rectangleY+            ww <- get wgeom rectangleWidth+            wh <- get wgeom rectangleHeight              geomHint <- newZeroGeometry-            geometryWriteMinWidth geomHint ww-            geometryWriteMinHeight geomHint wh-            geometryWriteMaxWidth geomHint ww-            geometryWriteMaxHeight geomHint wh++            set geomHint [ geometryMinWidth := ww+                         , geometryMinHeight := wh+                         , geometryMaxWidth := ww+                         , geometryMaxHeight := wh+                         ]+             windowSetGeometryHints window                 noWidget                 (Just geomHint)@@ -164,7 +166,7 @@     Just disp <- displayGetDefault     screen <- displayGetDefaultScreen disp     monitorSize <- screenGetMonitorGeometry screen (fromIntegral myMonitor)-    monitorW <- rectangleReadWidth monitorSize+    monitorW <- get monitorSize rectangleWidth      widgetSetSizeRequest wv (monitorW `div` 2) (fromIntegral barHeight) 

@@ -1,5 +1,5 @@ name:                tianbar-version:             1.1.0.0+version:             1.1.0.1 synopsis:            A desktop bar based on WebKit description:   A desktop bar using WebKit for rendering as much as possible.