hxournal 0.6.4 → 0.6.4.0

raw patch · 4 files changed

+8/−10 lines, 4 files

Files

• hxournal.cabal +1/−1
• lib/Application/HXournal/Coroutine/Page.hs +1/−1
• lib/Application/HXournal/Coroutine/Window.hs +6/−7
• lib/Application/HXournal/View/Coordinate.hs +0/−1

@@ -1,5 +1,5 @@ Name:		hxournal-Version:	0.6.4+Version:	0.6.4.0 Synopsis:	A pen notetaking program written in haskell  Description: 	notetaking program written in haskell and gtk2hs Homepage:       http://ianwookim.org/hxournal

@@ -95,7 +95,7 @@  canvasZoomUpdateCvsId :: CanvasId -> Maybe ZoomMode -> MainCoroutine () canvasZoomUpdateCvsId cid mzmode = updateXState zoomUpdateAction -                                   >> adjustScrollbarWithGeometryCurrent+                                   >> adjustScrollbarWithGeometryCvsId cid                                    >> invalidateAll   where zoomUpdateAction xst =             selectBoxAction (fsingle xst) (fcont xst) . getCanvasInfo cid $ xst 

@@ -51,6 +51,7 @@           return $ setCanvasInfo (cid,CanvasInfoBox cinfo') xstate         fcont xstate cinfo = do            let cinfo' = updateCanvasDimForContSingle cdim cinfo +          liftIO $ print cdim            return $ setCanvasInfo (cid,CanvasInfoBox cinfo') xstate   @@ -69,6 +70,7 @@       Right fstate' -> do          case maybeError "eitherSplit" . M.lookup currcid $ cmap of            CanvasInfoBox oldcinfo -> do +            liftIO $ putStrLn "called here"             let rtwin = get rootWindow xstate                 rtcntr = get rootContainer xstate              liftIO $ containerRemove rtcntr rtwin@@ -81,12 +83,14 @@             liftIO $ boxPackEnd rtcntr win PackGrow 0              liftIO $ widgetShowAll rtcntr               (xstate4,wconf) <- liftIO $ eventConnect xstate3 (get frameState xstate3)-            canvasZoomUpdateAll+            -- liftIO $ putStrLn " called here 2 " +            -- canvasZoomUpdateAll+            -- liftIO $ putStrLn " called here 3 "             xstate5 <- liftIO $ updatePageAll (get xournalstate xstate4) xstate4             putSt xstate5              invalidateAll  -                +             -- | @@ -125,8 +129,3 @@             putSt xstate5              invalidateAll              -{-            liftIO $ boxPackEnd rtcntr win PackGrow 0 -            liftIO $ widgetShowAll rtcntr   -            liftIO $ widgetDestroy (get scrolledWindow oldcinfo)-            liftIO $ widgetDestroy (get drawArea oldcinfo)- -}       

@@ -61,7 +61,6 @@                       -> IO CanvasGeometry  makeCanvasGeometry typ (cpn,page) arr canvas = do     win <- widgetGetDrawWindow canvas-  -- (w',h') <- return . ((,) <$> fromIntegral.fst <*> fromIntegral.snd) =<< widgetGetSize canvas   let cdim@(CanvasDimension (Dim w' h')) = get canvasDimension arr   screen <- widgetGetScreen canvas   (ws,hs) <- (,) <$> (fromIntegral <$> screenGetWidth screen)