Merge tag 'v1.9.3' into sc

* Convert the "Cryptography" settings panel to an HTML table to assist screen reader users. ([\#6968](matrix-org/matrix-react-sdk#6968)). Contributed by [andybalaam](https://github.com/andybalaam).
* Swap order of private space creation and tweak copy ([\#6967](matrix-org/matrix-react-sdk#6967)). Fixes element-hq/element-web#18768 and element-hq/element-web#18768.
* Add spacing to Room settings - Notifications subsection ([\#6962](matrix-org/matrix-react-sdk#6962)). Contributed by [CicadaCinema](https://github.com/CicadaCinema).
* Use HTML tables for some tabular user interface areas, to assist with screen reader use ([\#6955](matrix-org/matrix-react-sdk#6955)). Contributed by [andybalaam](https://github.com/andybalaam).
* Fix space invite edge cases ([\#6884](matrix-org/matrix-react-sdk#6884)). Fixes element-hq/element-web#19010 element-hq/element-web#17345 and element-hq/element-web#19010.
* Allow options to cascade kicks/bans throughout spaces ([\#6829](matrix-org/matrix-react-sdk#6829)). Fixes element-hq/element-web#18969 and element-hq/element-web#18969.
* Make public space alias field mandatory again ([\#6921](matrix-org/matrix-react-sdk#6921)). Fixes element-hq/element-web#19003 and element-hq/element-web#19003.
* Add progress bar to restricted room upgrade dialog ([\#6919](matrix-org/matrix-react-sdk#6919)). Fixes element-hq/element-web#19146 and element-hq/element-web#19146.
* Add customisation point for visibility of invites and room creation ([\#6922](matrix-org/matrix-react-sdk#6922)). Fixes element-hq/element-web#19331 and element-hq/element-web#19331.
* Inhibit `Unable to get validated threepid` error during UIA ([\#6928](matrix-org/matrix-react-sdk#6928)). Fixes element-hq/element-web#18883 and element-hq/element-web#18883.
* Tweak room list skeleton UI height and behaviour ([\#6926](matrix-org/matrix-react-sdk#6926)). Fixes element-hq/element-web#18231 element-hq/element-web#16581 and element-hq/element-web#18231.
* If public room creation fails, retry without publishing it ([\#6872](matrix-org/matrix-react-sdk#6872)). Fixes element-hq/element-web#19194 and element-hq/element-web#19194. Contributed by [AndrewFerr](https://github.com/AndrewFerr).
* Iterate invite your teammates to Space view ([\#6925](matrix-org/matrix-react-sdk#6925)). Fixes element-hq/element-web#18772 and element-hq/element-web#18772.
* Make placeholder more grey when no input ([\#6840](matrix-org/matrix-react-sdk#6840)). Fixes element-hq/element-web#17243 and element-hq/element-web#17243. Contributed by [wlach](https://github.com/wlach).
* Respect tombstones in locally known rooms for Space children ([\#6906](matrix-org/matrix-react-sdk#6906)). Fixes element-hq/element-web#19246 element-hq/element-web#19256 and element-hq/element-web#19246.
* Improve emoji shortcodes generated from annotations ([\#6907](matrix-org/matrix-react-sdk#6907)). Fixes element-hq/element-web#19304 and element-hq/element-web#19304.
* Hide kick & ban options in UserInfo when looking at own profile ([\#6911](matrix-org/matrix-react-sdk#6911)). Fixes element-hq/element-web#19066 and element-hq/element-web#19066.
* Add progress bar to Community to Space migration tool ([\#6887](matrix-org/matrix-react-sdk#6887)). Fixes element-hq/element-web#19216 and element-hq/element-web#19216.
* Fix leave space cancel button exploding ([\#6966](matrix-org/matrix-react-sdk#6966)).
* Fix edge case behaviour of the space join spinner for guests ([\#6972](matrix-org/matrix-react-sdk#6972)). Fixes element-hq/element-web#19359 and element-hq/element-web#19359.
* Convert emoticon to emoji at the end of a line on send even if the cursor isn't there ([\#6965](matrix-org/matrix-react-sdk#6965)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
* Fix text overflows button on Home page ([\#6898](matrix-org/matrix-react-sdk#6898)). Fixes element-hq/element-web#19180 and element-hq/element-web#19180. Contributed by [oliver-pham](https://github.com/oliver-pham).
* Space Room View should react to join rule changes down /sync ([\#6945](matrix-org/matrix-react-sdk#6945)). Fixes element-hq/element-web#19390 and element-hq/element-web#19390.
* Hide leave section button if user isn't in the room e.g peeking ([\#6920](matrix-org/matrix-react-sdk#6920)). Fixes element-hq/element-web#17410 and element-hq/element-web#17410.
* Fix bug where room list would get stuck showing no rooms ([\#6939](matrix-org/matrix-react-sdk#6939)). Fixes element-hq/element-web#19373 and element-hq/element-web#19373.
* Update room settings dialog title when room name changes ([\#6916](matrix-org/matrix-react-sdk#6916)). Fixes element-hq/element-web#17480 and element-hq/element-web#17480. Contributed by [psrpinto](https://github.com/psrpinto).
* Fix editing losing emote-ness and rainbow-ness of messages ([\#6931](matrix-org/matrix-react-sdk#6931)). Fixes element-hq/element-web#19350 and element-hq/element-web#19350.
* Remove semicolon from notifications panel ([\#6930](matrix-org/matrix-react-sdk#6930)). Contributed by [robintown](https://github.com/robintown).
* Prevent profile image in left panel's backdrop from being selected ([\#6924](matrix-org/matrix-react-sdk#6924)). Contributed by [rom4nik](https://github.com/rom4nik).
* Validate that the phone number verification field is filled before allowing user to submit ([\#6918](matrix-org/matrix-react-sdk#6918)). Fixes element-hq/element-web#19316 and element-hq/element-web#19316. Contributed by [VFermat](https://github.com/VFermat).
* Updated how save button becomes disabled in room settings to listen for all fields instead of the most recent ([\#6917](matrix-org/matrix-react-sdk#6917)). Contributed by [LoganArnett](https://github.com/LoganArnett).
* Use FocusLock around ContextMenus to simplify focus management ([\#6311](matrix-org/matrix-react-sdk#6311)). Fixes element-hq/element-web#19259 and element-hq/element-web#19259.
* Fix space hierarchy pagination ([\#6908](matrix-org/matrix-react-sdk#6908)). Fixes element-hq/element-web#19276 and element-hq/element-web#19276.
* Fix spaces keyboard shortcuts not working for last space ([\#6909](matrix-org/matrix-react-sdk#6909)). Fixes element-hq/element-web#19255 and element-hq/element-web#19255.
* Use fallback avatar only for DMs with 2 people. ([\#6895](matrix-org/matrix-react-sdk#6895)). Fixes element-hq/element-web#18747 and element-hq/element-web#18747. Contributed by [andybalaam](https://github.com/andybalaam).

CHANGELOG.md

@@ -1,3 +1,45 @@
+Changes in [1.9.3](https://github.com/vector-im/element-desktop/releases/tag/v1.9.3) (2021-10-25)
+=================================================================================================
+
+## ✨ Features
+ * Convert the "Cryptography" settings panel to an HTML table to assist screen reader users. ([\#6968](https://github.com/matrix-org/matrix-react-sdk/pull/6968)). Contributed by [andybalaam](https://github.com/andybalaam).
+ * Swap order of private space creation and tweak copy ([\#6967](https://github.com/matrix-org/matrix-react-sdk/pull/6967)). Fixes vector-im/element-web#18768 and vector-im/element-web#18768.
+ * Add spacing to Room settings - Notifications subsection ([\#6962](https://github.com/matrix-org/matrix-react-sdk/pull/6962)). Contributed by [CicadaCinema](https://github.com/CicadaCinema).
+ * Use HTML tables for some tabular user interface areas, to assist with screen reader use ([\#6955](https://github.com/matrix-org/matrix-react-sdk/pull/6955)). Contributed by [andybalaam](https://github.com/andybalaam).
+ * Fix space invite edge cases ([\#6884](https://github.com/matrix-org/matrix-react-sdk/pull/6884)). Fixes vector-im/element-web#19010 vector-im/element-web#17345 and vector-im/element-web#19010.
+ * Allow options to cascade kicks/bans throughout spaces ([\#6829](https://github.com/matrix-org/matrix-react-sdk/pull/6829)). Fixes vector-im/element-web#18969 and vector-im/element-web#18969.
+ * Make public space alias field mandatory again ([\#6921](https://github.com/matrix-org/matrix-react-sdk/pull/6921)). Fixes vector-im/element-web#19003 and vector-im/element-web#19003.
+ * Add progress bar to restricted room upgrade dialog ([\#6919](https://github.com/matrix-org/matrix-react-sdk/pull/6919)). Fixes vector-im/element-web#19146 and vector-im/element-web#19146.
+ * Add customisation point for visibility of invites and room creation ([\#6922](https://github.com/matrix-org/matrix-react-sdk/pull/6922)). Fixes vector-im/element-web#19331 and vector-im/element-web#19331.
+ * Inhibit `Unable to get validated threepid` error during UIA ([\#6928](https://github.com/matrix-org/matrix-react-sdk/pull/6928)). Fixes vector-im/element-web#18883 and vector-im/element-web#18883.
+ * Tweak room list skeleton UI height and behaviour ([\#6926](https://github.com/matrix-org/matrix-react-sdk/pull/6926)). Fixes vector-im/element-web#18231 vector-im/element-web#16581 and vector-im/element-web#18231.
+ * If public room creation fails, retry without publishing it ([\#6872](https://github.com/matrix-org/matrix-react-sdk/pull/6872)). Fixes vector-im/element-web#19194 and vector-im/element-web#19194. Contributed by [AndrewFerr](https://github.com/AndrewFerr).
+ * Iterate invite your teammates to Space view ([\#6925](https://github.com/matrix-org/matrix-react-sdk/pull/6925)). Fixes vector-im/element-web#18772 and vector-im/element-web#18772.
+ * Make placeholder more grey when no input ([\#6840](https://github.com/matrix-org/matrix-react-sdk/pull/6840)). Fixes vector-im/element-web#17243 and vector-im/element-web#17243. Contributed by [wlach](https://github.com/wlach).
+ * Respect tombstones in locally known rooms for Space children ([\#6906](https://github.com/matrix-org/matrix-react-sdk/pull/6906)). Fixes vector-im/element-web#19246 vector-im/element-web#19256 and vector-im/element-web#19246.
+ * Improve emoji shortcodes generated from annotations ([\#6907](https://github.com/matrix-org/matrix-react-sdk/pull/6907)). Fixes vector-im/element-web#19304 and vector-im/element-web#19304.
+ * Hide kick & ban options in UserInfo when looking at own profile ([\#6911](https://github.com/matrix-org/matrix-react-sdk/pull/6911)). Fixes vector-im/element-web#19066 and vector-im/element-web#19066.
+ * Add progress bar to Community to Space migration tool ([\#6887](https://github.com/matrix-org/matrix-react-sdk/pull/6887)). Fixes vector-im/element-web#19216 and vector-im/element-web#19216.
+
+## 🐛 Bug Fixes
+ * Fix leave space cancel button exploding ([\#6966](https://github.com/matrix-org/matrix-react-sdk/pull/6966)).
+ * Fix edge case behaviour of the space join spinner for guests ([\#6972](https://github.com/matrix-org/matrix-react-sdk/pull/6972)). Fixes vector-im/element-web#19359 and vector-im/element-web#19359.
+ * Convert emoticon to emoji at the end of a line on send even if the cursor isn't there ([\#6965](https://github.com/matrix-org/matrix-react-sdk/pull/6965)). Contributed by [SimonBrandner](https://github.com/SimonBrandner).
+ * Fix text overflows button on Home page ([\#6898](https://github.com/matrix-org/matrix-react-sdk/pull/6898)). Fixes vector-im/element-web#19180 and vector-im/element-web#19180. Contributed by [oliver-pham](https://github.com/oliver-pham).
+ * Space Room View should react to join rule changes down /sync ([\#6945](https://github.com/matrix-org/matrix-react-sdk/pull/6945)). Fixes vector-im/element-web#19390 and vector-im/element-web#19390.
+ * Hide leave section button if user isn't in the room e.g peeking ([\#6920](https://github.com/matrix-org/matrix-react-sdk/pull/6920)). Fixes vector-im/element-web#17410 and vector-im/element-web#17410.
+ * Fix bug where room list would get stuck showing no rooms ([\#6939](https://github.com/matrix-org/matrix-react-sdk/pull/6939)). Fixes vector-im/element-web#19373 and vector-im/element-web#19373.
+ * Update room settings dialog title when room name changes ([\#6916](https://github.com/matrix-org/matrix-react-sdk/pull/6916)). Fixes vector-im/element-web#17480 and vector-im/element-web#17480. Contributed by [psrpinto](https://github.com/psrpinto).
+ * Fix editing losing emote-ness and rainbow-ness of messages ([\#6931](https://github.com/matrix-org/matrix-react-sdk/pull/6931)). Fixes vector-im/element-web#19350 and vector-im/element-web#19350.
+ * Remove semicolon from notifications panel ([\#6930](https://github.com/matrix-org/matrix-react-sdk/pull/6930)). Contributed by [robintown](https://github.com/robintown).
+ * Prevent profile image in left panel's backdrop from being selected ([\#6924](https://github.com/matrix-org/matrix-react-sdk/pull/6924)). Contributed by [rom4nik](https://github.com/rom4nik).
+ * Validate that the phone number verification field is filled before allowing user to submit ([\#6918](https://github.com/matrix-org/matrix-react-sdk/pull/6918)). Fixes vector-im/element-web#19316 and vector-im/element-web#19316. Contributed by [VFermat](https://github.com/VFermat).
+ * Updated how save button becomes disabled in room settings to listen for all fields instead of the most recent ([\#6917](https://github.com/matrix-org/matrix-react-sdk/pull/6917)). Contributed by [LoganArnett](https://github.com/LoganArnett).
+ * Use FocusLock around ContextMenus to simplify focus management ([\#6311](https://github.com/matrix-org/matrix-react-sdk/pull/6311)). Fixes vector-im/element-web#19259 and vector-im/element-web#19259.
+ * Fix space hierarchy pagination ([\#6908](https://github.com/matrix-org/matrix-react-sdk/pull/6908)). Fixes vector-im/element-web#19276 and vector-im/element-web#19276.
+ * Fix spaces keyboard shortcuts not working for last space ([\#6909](https://github.com/matrix-org/matrix-react-sdk/pull/6909)). Fixes vector-im/element-web#19255 and vector-im/element-web#19255.
+ * Use fallback avatar only for DMs with 2 people. ([\#6895](https://github.com/matrix-org/matrix-react-sdk/pull/6895)). Fixes vector-im/element-web#18747 and vector-im/element-web#18747. Contributed by [andybalaam](https://github.com/andybalaam).
+
 Changes in [1.9.2](https://github.com/vector-im/element-desktop/releases/tag/v1.9.2) (2021-10-12)
 =================================================================================================
 

src/electron-main.ts

@@ -325,7 +325,12 @@ process.on('uncaughtException', function(error) {
 
 let focusHandlerAttached = false;
 ipcMain.on('setBadgeCount', function(ev, count) {
-    app.badgeCount = count;
+    if (process.platform !== 'win32') {
+        // only set badgeCount on Mac/Linux, the docs say that only those platforms support it but turns out Electron
+        // has some Windows support too, and in some Windows environments this leads to two badges rendering atop
+        // each other. See https://github.com/vector-im/element-web/issues/16942
+        app.badgeCount = count;
+    }
     if (count === 0 && mainWindow) {
         mainWindow.flashFrame(false);
     }