Update documentation and Changelog (#89)

* Update Changelog

* Use clearer names in Container's merge

* Add an extra note for Windows builds

* Use latest GHC 8.10.7 Stack LTS

ChangeLog.md

@@ -1,8 +1,14 @@
 ## 1.4.0.0 (in development)
 
+### Fixed
+
+- Properly handle `SetFocusOnKey` for `textArea` ([#80](https://github.com/fjvallarino/monomer/issues/80)).
+
 ### Added
 
 - Utility functions `rectFromPoints`, `nodeInfoFromKey`, `nodeInfoFromPath` and `findParentNodeInfoByType`.
+- Allow setting the window icon via AppConfig ([PR #79](https://github.com/fjvallarino/monomer/pull/79)). Thanks @Dretch!
+- Add support for breaking text lines at character boundaries ([PR #86](https://github.com/fjvallarino/monomer/pull/86)). Thanks @toku-sa-n!
 
 ### Changed
 
@@ -10,18 +16,19 @@
   generated event was updated to reflect this change. The rationale is that since `onInit` is sent to
   `handleEvent`, having `onChange` sent to its parent was confusing. At the same time there was not an easy way
   in `handleEvent` to know when the model changed. Widgets that want to report model changes to its parent can
-  use `Report`/`RequestParent`; an example can be found in `ColorPicker`.
-- The `keystroke` widget now supports `Backspace` key.
+  use `Report`/`RequestParent`; an example can be found in `ColorPicker` ([PR #71](https://github.com/fjvallarino/monomer/pull/71)).
+- The `keystroke` widget now supports `Backspace` key ([PR #74](https://github.com/fjvallarino/monomer/pull/74)).
 
 ### Renamed
 
-- `findWidgetByPath` -> `findChildNodeInfoByPath`.
-- `findWidgetBranchByPath` -> `findChildBranchByPath`.
-- `findWidgetIdFromPath` -> `widgetIdFromPath`.
+- Utility functions for retrieving `WidgetNode` information ([PR #75](https://github.com/fjvallarino/monomer/pull/75))
+  - `findWidgetByPath` -> `findChildNodeInfoByPath`.
+  - `findWidgetBranchByPath` -> `findChildBranchByPath`.
+  - `findWidgetIdFromPath` -> `widgetIdFromPath`.
 
 ### Removed
 
-- Dependencies on `OpenGL`, `Safe`, `scientific`, `unordered-containers`, `directory`, `HUnit` and `silently`.
+- Dependencies on `OpenGL`, `Safe`, `scientific`, `unordered-containers`, `directory`, `HUnit` and `silently` ([PR #70](https://github.com/fjvallarino/monomer/pull/70)).
 
 ## 1.3.0.0
 

docs/tutorials/00-setup.md

@@ -90,12 +90,18 @@ Stack installs its files in two locations:
 - `%STACK_ROOT%` (usually `C:\sr`, unless modified)
 - `%LOCALAPPDATA%\Programs\stack`
 
-The second location is the one that contains MinGW. Removing
+The second location is the directory that contains MinGW. Removing
 `%LOCALAPPDATA%\Programs\stack` and running the above steps again is usually
-enough to get a working environment.
+enough to get a working environment. If this does not work, removing
+`%STACK_ROOT%` and reinstalling Stack may be required.
 
-If this does not work, removing `%STACK_ROOT%` and reinstalling Stack may be
-required.
+If the previous steps did not fix the issue, updating the keyring with the
+following commands and building again may help:
+
+```bash
+stack exec -- pacman -S msys2-keyring
+stack exec -- pacman -Syu
+```
 
 ## Build the project
 

src/Monomer/Widgets/Container.hs

@@ -680,13 +680,13 @@ mergeChildren
   -> WidgetNode s e
   -> WidgetResult s e
   -> WidgetResult s e
-mergeChildren updateCWenv !wenv !newNode !oldNode !result = newResult where
-  WidgetResult uNode uReqs = result
+mergeChildren updateCWenv !wenv !newNode !oldNode !pResult = newResult where
+  WidgetResult pNode pReqs = pResult
   oldChildren = oldNode ^. L.children
   oldIts = Seq.mapWithIndex (,) oldChildren
-  updatedChildren = uNode ^. L.children
+  updatedChildren = pNode ^. L.children
 
-  mergeChild idx child = (idx, cascadeCtx wenv uNode child idx)
+  mergeChild idx child = (idx, cascadeCtx wenv pNode child idx)
   newIts = Seq.mapWithIndex mergeChild updatedChildren
   oldKeys = buildLocalMap oldChildren
   newKeys = buildLocalMap (snd <$> newIts)
@@ -696,8 +696,8 @@ mergeChildren updateCWenv !wenv !newNode !oldNode !result = newResult where
   mergedChildren = fmap _wrNode mergedResults
   mergedReqs = foldMap _wrRequests mergedResults
   removedReqs = foldMap _wrRequests removedResults
-  mergedNode = uNode & L.children .~ mergedChildren
-  newReqs = uReqs <> mergedReqs <> removedReqs
+  mergedNode = pNode & L.children .~ mergedChildren
+  newReqs = pReqs <> mergedReqs <> removedReqs
   !newResult = WidgetResult mergedNode newReqs
 
 mergeChildSeq

stack.yaml

@@ -18,7 +18,7 @@
 
 #resolver: lts-14.27
 #resolver: lts-17.15
-resolver: lts-18.19
+resolver: lts-18.27
 
 # User packages to be built.
 # Various formats can be used as shown in the example below.

stack.yaml.lock

@@ -13,7 +13,7 @@ packages:
     hackage: nanovg-0.8.0.0@sha256:0183b4295ccc2dfb94a7eca977fb45759e1480652578936aa7b71bb4b9626480,4742
 snapshots:
 - completed:
-    size: 586103
-    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/19.yaml
-    sha256: 32716534fff554b7f90762130fdb985cabf29f157758934dd1c8f3892a646430
-  original: lts-18.19
+    size: 590102
+    url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/27.yaml
+    sha256: 79a786674930a89301b0e908fad2822a48882f3d01486117693c377b8edffdbe
+  original: lts-18.27