Closed devinbinnie closed 1 month ago
NOTE: Will have to update this when cherry-picking to v5.9, as Windows doesn't use these new buttons on v5.9.
What are these new buttons? Just trying to get more context here
NOTE: Will have to update this when cherry-picking to v5.9, as Windows doesn't use these new buttons on v5.9.
What are these new buttons? Just trying to get more context here
They're not really new - just replacements for what we had, using native Electron APIs instead of the custom ones we had ourselves.
Anything we can test to avoid this issue in the future?
If we had front-end tests, absolutely. Never was able to add those. Add to the pile of things to do for Desktop App 🙃
Cherry pick is scheduled.
Error trying doing the automated Cherry picking. Please do this manually
+++ Updating remotes...
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
From github.com:mattermost/desktop
* [new branch] MM-60201 -> upstream/MM-60201
820ef4d4..9db56c50 MM-60605 -> upstream/MM-60605
* [new branch] disable_fullscreen_linux -> upstream/disable_fullscreen_linux
b4eeabb3..3b179c7e master -> upstream/master
97c7331c..0e49afd5 release-5.9 -> upstream/release-5.9
* [new branch] sbom -> upstream/sbom
Fetching upstream
hostfile_replace_entries: mkstemp: Read-only file system
update_known_hosts: hostfile_replace_entries failed for /app/.ssh/known_hosts: Read-only file system
+++ Updating remotes done...
+++ Creating local branch automated-cherry-pick-of-desktop-#3148-upstream-release-5.9-1727095303
Switched to a new branch 'automated-cherry-pick-of-desktop-#3148-upstream-release-5.9-1727095303'
Branch 'automated-cherry-pick-of-desktop-#3148-upstream-release-5.9-1727095303' set up to track remote branch 'release-5.9' from 'upstream'.
+++ About to attempt cherry pick of PR #3148 with merge commit 3b179c7ec2d9936b0079874d30092005c44d0276.
Auto-merging src/renderer/components/MainPage.tsx
CONFLICT (content): Merge conflict in src/renderer/components/MainPage.tsx
Auto-merging src/renderer/css/index.css
CONFLICT (content): Merge conflict in src/renderer/css/index.css
Auto-merging src/types/window.ts
error: could not apply 3b179c7e... [MM-60605] Fix the Download button being hidden on Windows/Linux (#3148)
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
+++ Conflicts detected:
UU src/renderer/components/MainPage.tsx
UU src/renderer/css/index.css
Aborting.
+++ Aborting in-progress git cherry-pick.
+++ Returning you to the master branch and cleaning up.
Summary
When we made the change to switch to the titleBarOverlay for Windows and Linux, the Downloads dropdown button has disappeared. This is because it was hidden behind the new overlay.
This PR adds a
span
to force the Downloads dropdown in front of the title bar buttons.NOTE: Will have to update this when cherry-picking to v5.9, as Windows doesn't use these new buttons on v5.9.
Ticket Link
https://mattermost.atlassian.net/browse/MM-60605