@@ -110,7 +110,7 @@ run main = do
110 _ <- timeoutAdd PRIORITY_HIGH 10 (yield >> return True)
110 _ <- timeoutAdd PRIORITY_HIGH 10 (yield >> return True)
111 windowSetDefaultSize window 900 600
111 windowSetDefaultSize window 900 600
112 windowSetPosition window WindowPositionCenter
112 windowSetPosition window WindowPositionCenter
113− scrollWin <- scrolledWindowNew (Nothing :: Maybe Adjustment) (Nothing :: Maybe Adjustment)
113+ scrollWin <- scrolledWindowNew noAdjustment noAdjustment
114 contentManager <- userContentManagerNew
114 contentManager <- userContentManagerNew
115 webView <- webViewNewWithUserContentManager contentManager
115 webView <- webViewNewWithUserContentManager contentManager
116 settings <- webViewGetSettings webView
116 settings <- webViewGetSettings webView
@@ -134,11 +134,11 @@ run main = do
134runInWebView :: JSM () -> WebView -> IO ()
134runInWebView :: JSM () -> WebView -> IO ()
135runInWebView f webView = do
135runInWebView f webView = do
136 (processResults, syncResults, start) <- runJavaScript (\batch -> postGUIAsync $
136 (processResults, syncResults, start) <- runJavaScript (\batch -> postGUIAsync $
137− webViewRunJavascript webView (decodeUtf8 . toStrict $ "runJSaddleBatch(" <> encode batch <> ");") (Nothing :: Maybe Cancellable) Nothing)
137+ webViewRunJavascript webView (decodeUtf8 . toStrict $ "runJSaddleBatch(" <> encode batch <> ");") noCancellable Nothing)
140 addJSaddleHandler webView processResults syncResults
140 addJSaddleHandler webView processResults syncResults
141− webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) (Nothing :: Maybe Cancellable) . Just $
141+ webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) noCancellable . Just $
142 \_obj _asyncResult ->
142 \_obj _asyncResult ->
143 void $ forkIO start
143 void $ forkIO start