on master help sign in
Put noAdjustment and noCancellable back
commit4a62598d00ce77918cdf56fd36944baa3b246b5b authorHamish Mackenzie <Hamish.K.Mackenzie@gmail.com> dateSat 26 Jun 2021, 23:30 (5 years ago) parent6e41653
1 file changed+3−3
jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+3−3
jsaddle-webkit2gtk/src/Language/Javascript/JSaddle/WebKitGTK.hs+3−3
@@ -110,7 +110,7 @@ run main = do
110110 _ <- timeoutAdd PRIORITY_HIGH 10 (yield >> return True)
111111 windowSetDefaultSize window 900 600
112112 windowSetPosition window WindowPositionCenter
113− scrollWin <- scrolledWindowNew (Nothing :: Maybe Adjustment) (Nothing :: Maybe Adjustment)
113+ scrollWin <- scrolledWindowNew noAdjustment noAdjustment
114114 contentManager <- userContentManagerNew
115115 webView <- webViewNewWithUserContentManager contentManager
116116 settings <- webViewGetSettings webView
@@ -134,11 +134,11 @@ run main = do
134134runInWebView :: JSM () -> WebView -> IO ()
135135runInWebView f webView = do
136136 (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)
138138 f
139139
140140 addJSaddleHandler webView processResults syncResults
141− webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) (Nothing :: Maybe Cancellable) . Just $
141+ webViewRunJavascript webView (decodeUtf8 $ toStrict jsaddleJs) noCancellable . Just $
142142 \_obj _asyncResult ->
143143 void $ forkIO start
144144