oak-team/oak-gpui
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Add setting to show/hide title bar (#37428)" (#38756)

Browse Source 
Closes https://github.com/zed-industries/zed/issues/38547

Release Notes:

- Reverted the ability to show/hide the titlebar. This caused rendering
bugs on
macOS, and we're preparing for the redesign which requires the toolbar
being present.

---------

Co-authored-by: Kirill Bulatov <kirill@zed.dev>
This commit is contained in:
Conrad Irwin
2025-09-24 07:15:30 +03:00
committed by GitHub
co-authored by Kirill Bulatov
parent 0f7dbf57f5
commit 5d89b2ea26
8 changed files with 58 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/title_bar/src/title_bar.rs
+4 -45
View File
@@ -4,7 +4,7 @@ mod onboarding_banner;
pub mod platform_title_bar;
mod platforms;
mod system_window_tabs;
pub mod title_bar_settings;
mod title_bar_settings;
#[cfg(feature = "stories")]
mod stories;
@@ -35,7 +35,7 @@ use remote::RemoteConnectionOptions;
use settings::{Settings, SettingsLocation};
use std::{path::Path, sync::Arc};
use theme::ActiveTheme;
use title_bar_settings::{TitleBarSettings, TitleBarVisibility};
use title_bar_settings::TitleBarSettings;
use ui::{
Avatar, Button, ButtonLike, ButtonStyle, Chip, ContextMenu, Icon, IconName, IconSize,
IconWithIndicator, Indicator, PopoverMenu, PopoverMenuHandle, Tooltip, h_flex, prelude::*,
@@ -73,49 +73,8 @@ pub fn init(cx: &mut App) {
let Some(window) = window else {
return;
};
let should_show = match TitleBarSettings::get_global(cx).show {
TitleBarVisibility::Always => true,
TitleBarVisibility::Never => false,
TitleBarVisibility::HideInFullScreen => !window.is_fullscreen(),
};
if should_show {
let item = cx.new(|cx| TitleBar::new("title-bar", workspace, window, cx));
workspace.set_titlebar_item(item.into(), window, cx);
}
cx.observe_global_in::<settings::SettingsStore>(window, |workspace, window, cx| {
let should_show = match TitleBarSettings::get_global(cx).show {
TitleBarVisibility::Always => true,
TitleBarVisibility::Never => false,
TitleBarVisibility::HideInFullScreen => !window.is_fullscreen(),
};
if should_show {
if workspace.titlebar_item().is_none() {
let item = cx.new(|cx| TitleBar::new("title-bar", workspace, window, cx));
workspace.set_titlebar_item(item.into(), window, cx);
}
} else {
workspace.clear_titlebar_item(window, cx);
}
})
.detach();
cx.observe_window_bounds(window, |workspace, window, cx| {
let should_show = match TitleBarSettings::get_global(cx).show {
TitleBarVisibility::Always => true,
TitleBarVisibility::Never => false,
TitleBarVisibility::HideInFullScreen => !window.is_fullscreen(),
};
if should_show {
if workspace.titlebar_item().is_none() {
let item = cx.new(|cx| TitleBar::new("title-bar", workspace, window, cx));
workspace.set_titlebar_item(item.into(), window, cx);
}
} else {
workspace.clear_titlebar_item(window, cx);
}
})
.detach();
let item = cx.new(|cx| TitleBar::new("title-bar", workspace, window, cx));
workspace.set_titlebar_item(item.into(), window, cx);
#[cfg(not(target_os = "macos"))]
workspace.register_action(|workspace, action: &OpenApplicationMenu, window, cx| {
crates/title_bar/src/title_bar_settings.rs
-3
View File
@@ -1,10 +1,8 @@
pub use settings::TitleBarVisibility;
use settings::{Settings, SettingsContent};
use ui::App;
#[derive(Copy, Clone, Debug)]
pub struct TitleBarSettings {
pub show: TitleBarVisibility,
pub show_branch_icon: bool,
pub show_onboarding_banner: bool,
pub show_user_picture: bool,
@@ -18,7 +16,6 @@ impl Settings for TitleBarSettings {
fn from_settings(s: &SettingsContent, _: &mut App) -> Self {
let content = s.title_bar.clone().unwrap();
TitleBarSettings {
show: content.show.unwrap(),
show_branch_icon: content.show_branch_icon.unwrap(),
show_onboarding_banner: content.show_onboarding_banner.unwrap(),
show_user_picture: content.show_user_picture.unwrap(),