Close task view on postpone

Author: cblp

ff-qtah/FF/Qt/MainWindow.hs

@@ -115,7 +115,7 @@ new progName storage = do
 
 -- | Only task notes are supported. TODO support wiki notes too
 upsertNote :: MainWindow -> EntityView Note -> IO ()
-upsertNote MainWindow{agendaTasks} = TaskListWidget.upsertTask agendaTasks
+upsertNote MainWindow{agendaTasks} = TaskListWidget.upsertTask agendaTasks True
 
 -- https://wiki.qt.io/Saving_Window_Size_State
 saveGeometryAndState :: (QMainWindowPtr window) => window -> IO Bool

ff-qtah/FF/Qt/TaskListWidget.hs

@@ -22,7 +22,7 @@ import Data.Map.Strict (Map, (!))
 import Data.Map.Strict qualified as Map
 import Data.Text qualified as Text
 import Data.Time (getCurrentTime, toGregorian, utctDay)
-import Foreign.Hoppy.Runtime (fromCppEnum, toGc)
+import Foreign.Hoppy.Runtime (fromCppEnum, nullptr, toGc)
 import Graphics.UI.Qtah.Core.Types qualified as Qt
 import Graphics.UI.Qtah.Gui.QFont (QFont)
 import Graphics.UI.Qtah.Gui.QFont qualified as QFont
@@ -115,8 +115,8 @@ setDebugInfoVisible this v = do
     QTreeView.setColumnHidden this.parent (fromEnum SortKeyField) $ not v
     QTreeView.setHeaderHidden this.parent $ not v
 
-upsertTask :: TaskListWidget -> EntityView Note -> IO ()
-upsertTask this entity = do
+upsertTask :: TaskListWidget -> Bool -> EntityView Note -> IO ()
+upsertTask this keepTaskOpen entity = do
     today <- utctDay <$> getCurrentTime -- TODO get local day
     let mode = taskMode today note
     mExisting <- Map.lookup noteId <$> readIORef this.taskItems
@@ -127,15 +127,20 @@ upsertTask this entity = do
             modifyIORef this.taskItems $ Map.insert noteId (mode, item)
         Just (oldMode, item) -> do
             updateTaskItem item entity
+            wasSelected <- QTreeWidgetItem.isSelected item
             when (oldMode /= mode) do
-                wasSelected <- QTreeWidgetItem.isSelected item
                 oldModeItem <- (! oldMode) <$> readIORef this.modeItems
                 idx <- QTreeWidgetItem.indexOfChild oldModeItem item
                 _ <- QTreeWidgetItem.takeChild oldModeItem idx
                 newModeItem <- getOrCreateModeItem this mode
                 QTreeWidgetItem.addChild newModeItem item
-                when wasSelected $ QTreeWidget.setCurrentItem this.parent item
                 modifyIORef this.taskItems $ Map.insert noteId (mode, item)
+            if keepTaskOpen then
+                when wasSelected $ QTreeWidget.setCurrentItem this.parent item
+            else
+                QTreeWidget.setCurrentItem
+                    this.parent
+                    (nullptr :: QTreeWidgetItem)
   where
     Entity{entityId = DocId noteId, entityVal = NoteView{note}} = entity
 

ff-qtah/FF/Qt/TaskWidget.hs

@@ -43,6 +43,12 @@ import FF.Types (
 import FF.Qt.DateComponent (DateComponent)
 import FF.Qt.DateComponent qualified as DateComponent
 
+type OnTaskUpdated =
+    -- | Keep open task view (e.g. on postpone)
+    Bool ->
+    EntityView Note ->
+    IO ()
+
 data TaskWidget = TaskWidget
     { parent :: QScrollArea
     , innerWidget :: QFrame
@@ -52,10 +58,10 @@ data TaskWidget = TaskWidget
     , start :: DateComponent
     , end :: DateComponent
     , noteId :: IORef (Maybe NoteId)
-    , onTaskUpdated :: EntityView Note -> IO ()
+    , onTaskUpdated :: OnTaskUpdated
     }
 
-new :: Storage.Handle -> (EntityView Note -> IO ()) -> IO TaskWidget
+new :: Storage.Handle -> OnTaskUpdated -> IO TaskWidget
 new storage onTaskUpdated = do
     parent <- QScrollArea.new
 
@@ -111,16 +117,16 @@ postponeSlot this _checked = do
     mNoteId <- readIORef this.noteId
     case mNoteId of
         Just noteId ->
-            runStorage this.storage (cmdPostpone noteId) >>= update this
+            runStorage this.storage (cmdPostpone noteId) >>= update False this
         Nothing -> pure ()
 
 reload :: TaskWidget -> NoteId -> IO ()
 reload this noteId = do
     atomicWriteIORef this.noteId $ Just noteId
-    runStorage this.storage (loadNote noteId) >>= update this
+    runStorage this.storage (loadNote noteId) >>= update True this
 
-update :: TaskWidget -> EntityDoc Note -> IO ()
-update this noteDoc = do
+update :: Bool -> TaskWidget -> EntityDoc Note -> IO ()
+update keepOpen this noteDoc = do
     entity <- runStorage this.storage $ viewNote noteDoc
     let Entity{entityVal} = entity
     let NoteView{note} = entityVal
@@ -129,7 +135,7 @@ update this noteDoc = do
     DateComponent.setDate this.start note_start
     DateComponent.setDate this.end note_end
     QWidget.adjustSize this.innerWidget
-    this.onTaskUpdated entity
+    this.onTaskUpdated keepOpen entity
 
 makeSimpleSizePolicy :: QSizePolicyPolicy -> IO QSizePolicy
 makeSimpleSizePolicy policy =