feat: Title bar option improvements + native title bar option for mac #854
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
feat: Add ability for macOS to use the native title bar
|
|
|
done |
Vendicated
reviewed
Oct 14, 2024
| transparencyOption && | ||
| transparencyOption !== "none" && { | ||
| transparent: true | ||
| }), | ||
| ...(staticTitle && { title: "Vesktop" }), | ||
| ...(process.platform === "darwin" && getDarwinOptions()), | ||
| ...(process.platform === "darwin" && titleBar !== "shown" && getDarwinOptions()), // Show/Hide titlebar depending on settings on Mac |
There was a problem hiding this comment.
getDarwinOptions() is responsible for more than just the titlebar so this will break various features
| @@ -57,8 +53,11 @@ const SettingsOptions: Record<string, Array<BooleanSetting | SettingsComponent>> | |||
| title: "Enable Menu Bar", | |||
| description: "Enables the application menu bar. Press ALT to toggle visibility.", | |||
| defaultValue: false, | |||
| disabled: () => Settings.store.customTitleBar ?? isWindows | |||
| }, | |||
| invisible: () => isMac, | |||
| options={[ | ||
| ...(isMac ? [{ label: "Hidden", value: "hidden", default: isMac }] : []), | ||
| { label: "Native", value: "shown" }, | ||
| { label: "Discord", value: "custom", default: isWindows } |
There was a problem hiding this comment.
Suggested change
| { label: "Discord", value: "custom", default: isWindows } | |
| { label: "Custom Discord titlebar", value: "custom", default: isWindows } |
| placeholder="Hidden" | ||
| options={[ | ||
| ...(isMac ? [{ label: "Hidden", value: "hidden", default: isMac }] : []), | ||
| { label: "Native", value: "shown" }, |
There was a problem hiding this comment.
Suggested change
| { label: "Native", value: "shown" }, | |
| { label: "Native System Titlebar", value: "shown" }, |
| <Select | ||
| placeholder="Hidden" | ||
| options={[ | ||
| ...(isMac ? [{ label: "Hidden", value: "hidden", default: isMac }] : []), |
There was a problem hiding this comment.
i think this is what this setting means?
Suggested change
| ...(isMac ? [{ label: "Hidden", value: "hidden", default: isMac }] : []), | |
| ...(isMac ? [{ label: "Hidden with inset traffic light buttons", value: "hidden", default: isMac }] : []), |
Comment on lines
+16
to
+19
| <Forms.FormText className={Margins.bottom8}> | ||
| Customize apps title bar. Pick Discord if you want to use Discord's custom title bar. Requires a full | ||
| restart | ||
| </Forms.FormText> |
There was a problem hiding this comment.
i don't think this should be necessary if you just label the options better
| @@ -20,7 +20,7 @@ export interface Settings { | |||
| appBadge?: boolean; | |||
| disableMinSize?: boolean; | |||
| clickTrayToShowHide?: boolean; | |||
| customTitleBar?: boolean; | |||
| titleBar?: "hidden" | "shown" | "custom"; | |||
There was a problem hiding this comment.
the values are kinda misleading
Suggested change
| titleBar?: "hidden" | "shown" | "custom"; | |
| titleBar?: "inset" | "system" | "discord"; |
| @@ -20,7 +20,7 @@ export interface Settings { | |||
| appBadge?: boolean; | |||
| disableMinSize?: boolean; | |||
| clickTrayToShowHide?: boolean; | |||
| customTitleBar?: boolean; | |||
There was a problem hiding this comment.
when changing settings names, old settings should be migrated to the new key so users won't have their choice reset. you will likely have to do this in the main process so it applies immediately
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Details
NOTE: has not been tested on Windows or Linux, also my first time trying out TS! Be mindful.