feat: add UI settings to support native title bar style

Author: nshcr

apps/desktop/cypress/e2e/support/mock/settings.ts

@@ -33,5 +33,8 @@ export const MOCK_APP_SETTINGS: AppSettings = {
 	},
 	reviews: {
 		autoFillPrDescriptionFromCommit: true
+	},
+	ui: {
+		useNativeTitleBar: false
 	}
 };

apps/desktop/src/components/ChromeHeader.svelte

@@ -45,6 +45,7 @@
 	const isWorkspace = $derived(isWorkspacePath());
 	const canUseActions = $derived($settingsStore?.featureFlags.actions ?? false);
 	const singleBranchMode = $derived($settingsStore?.featureFlags.singleBranch ?? false);
+	const enableTauriDrag = $derived(!($settingsStore?.ui.useNativeTitleBar ?? false));
 	const backend = inject(BACKEND);
 
 	const mode = $derived(modeService.mode({ projectId }));
@@ -112,11 +113,11 @@
 <div
 	class="chrome-header"
 	class:mac={backend.platformName === 'macos'}
-	data-tauri-drag-region
+	data-tauri-drag-region={enableTauriDrag}
 	class:single-branch={singleBranchMode}
 	use:focusable
 >
-	<div class="chrome-left" data-tauri-drag-region>
+	<div class="chrome-left" data-tauri-drag-region={enableTauriDrag}>
 		<div class="chrome-left-buttons" class:macos={backend.platformName === 'macos'}>
 			<SyncButton {projectId} disabled={actionsDisabled} />
 
@@ -138,7 +139,7 @@
 		</div>
 	</div>
 
-	<div class="chrome-center" data-tauri-drag-region>
+	<div class="chrome-center" data-tauri-drag-region={enableTauriDrag}>
 		<div class="chrome-selector-wrapper">
 			<Select
 				searchable
@@ -244,7 +245,7 @@
 		{/if}
 	</div>
 
-	<div class="chrome-right" data-tauri-drag-region>
+	<div class="chrome-right" data-tauri-drag-region={enableTauriDrag}>
 		{#if $ircEnabled}
 			<NotificationButton
 				hasUnread={isNotificationsUnread}

apps/desktop/src/lib/config/appSettingsV2.ts

@@ -67,6 +67,10 @@ export class SettingsService {
 		await this.backend.invoke('update_fetch', { update });
 	}
 
+	async updateUi(update: Partial<UiSettings>) {
+		await this.backend.invoke('update_ui', { update });
+	}
+
 	private async nudge(): Promise<void> {
 		await this.autoOptInWs3();
 		await this.autoOptInRules();
@@ -154,6 +158,8 @@ export type AppSettings = {
 	claude: Claude;
 	/** Settings related to code reviews and pull requests */
 	reviews: Reviews;
+	/** UI settings */
+	ui: UiSettings;
 };
 
 export type TelemetrySettings = {
@@ -206,3 +212,8 @@ export type Reviews = {
 	/** Whether to auto-fill PR title and description from the first commit when a branch has only one commit. */
 	autoFillPrDescriptionFromCommit: boolean;
 };
+
+export type UiSettings = {
+	/** Whether to use the native system title bar. */
+	useNativeTitleBar: boolean;
+};

crates/but-api/src/commands/settings.rs

@@ -1,7 +1,7 @@
 //! In place of commands.rs
 use but_api_macros::api_cmd;
 use but_settings::api::{
-    ClaudeUpdate, FeatureFlagsUpdate, FetchUpdate, ReviewsUpdate, TelemetryUpdate,
+    ClaudeUpdate, FeatureFlagsUpdate, FetchUpdate, ReviewsUpdate, TelemetryUpdate, UiUpdate,
 };
 use but_settings::{AppSettings, AppSettingsWithDiskSync};
 use serde::Deserialize;
@@ -121,3 +121,18 @@ pub fn update_fetch(
         .update_fetch(params.update)
         .map_err(|e| e.into())
 }
+
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct UpdateUiParams {
+    pub update: UiUpdate,
+}
+
+pub fn update_ui(
+    app_settings_sync: &AppSettingsWithDiskSync,
+    params: UpdateUiParams,
+) -> Result<(), Error> {
+    app_settings_sync
+        .update_ui(params.update)
+        .map_err(|e| e.into())
+}

crates/but-settings/assets/defaults.jsonc

@@ -64,5 +64,10 @@
 	"reviews": {
 		// Whether to auto-fill PR title and description from the first commit when a branch has only one commit.
 		"autoFillPrDescriptionFromCommit": true
+	},
+	// UI settings.
+	"ui": {
+		// Whether to use the native system title bar.
+		"useNativeTitleBar": false
 	}
 }

crates/but-settings/src/api.rs

@@ -49,6 +49,13 @@ pub struct FetchUpdate {
     pub auto_fetch_interval_minutes: Option<isize>,
 }
 
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+/// Update request for [`crate::app_settings::UiSettings`].
+pub struct UiUpdate {
+    pub use_native_title_bar: Option<bool>,
+}
+
 /// Mutation, immediately followed by writing everything to disk.
 impl AppSettingsWithDiskSync {
     pub fn update_onboarding_complete(&self, update: bool) -> Result<()> {
@@ -151,4 +158,12 @@ impl AppSettingsWithDiskSync {
         }
         settings.save()
     }
+
+    pub fn update_ui(&self, update: UiUpdate) -> Result<()> {
+        let mut settings = self.get_mut_enforce_save()?;
+        if let Some(use_native_title_bar) = update.use_native_title_bar {
+            settings.ui.use_native_title_bar = use_native_title_bar;
+        }
+        settings.save()
+    }
 }

crates/but-settings/src/app_settings.rs

@@ -91,3 +91,10 @@ pub struct Reviews {
     /// Whether to auto-fill PR title and description from the first commit when a branch has only one commit.
     pub auto_fill_pr_description_from_commit: bool,
 }
+
+#[derive(Copy, Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
+#[serde(rename_all = "camelCase")]
+pub struct UiSettings {
+    /// Whether to use the native system title bar.
+    pub use_native_title_bar: bool,
+}

crates/but-settings/src/lib.rs

@@ -22,6 +22,8 @@ pub struct AppSettings {
     pub claude: app_settings::Claude,
     /// Settings related to code reviews and pull requests.
     pub reviews: app_settings::Reviews,
+    /// UI settings.
+    pub ui: app_settings::UiSettings,
 }
 
 impl Default for AppSettings {

crates/gitbutler-tauri/src/main.rs

@@ -297,6 +297,7 @@ fn main() {
                     settings::update_claude,
                     settings::update_fetch,
                     settings::update_reviews,
+                    settings::update_ui,
                     action::list_actions,
                     action::handle_changes,
                     action::list_workflows,

crates/gitbutler-tauri/src/settings.rs

@@ -1,7 +1,7 @@
 #![allow(deprecated)]
 use but_api::commands::settings;
 use but_settings::api::{
-    ClaudeUpdate, FeatureFlagsUpdate, FetchUpdate, ReviewsUpdate, TelemetryUpdate,
+    ClaudeUpdate, FeatureFlagsUpdate, FetchUpdate, ReviewsUpdate, TelemetryUpdate, UiUpdate,
 };
 use but_settings::AppSettingsWithDiskSync;
 use tauri::State;
@@ -83,3 +83,12 @@ pub fn update_reviews(
 ) -> Result<(), Error> {
     settings::update_reviews(&app_settings_sync, settings::UpdateReviewsParams { update })
 }
+
+#[tauri::command(async)]
+#[instrument(skip(app_settings_sync), err(Debug))]
+pub fn update_ui(
+    app_settings_sync: State<'_, AppSettingsWithDiskSync>,
+    update: UiUpdate,
+) -> Result<(), Error> {
+    settings::update_ui(&app_settings_sync, settings::UpdateUiParams { update })
+}