b9819977a5
Includes prior-session patches (carry forward so the app compiles): - crates/gpui/build.rs: cross-compile manifest fix - crates/gpui/src/platform.rs: PlatformWindow::activate_with_token trait method - crates/gpui/src/window.rs: Window::activate_with_token public API - crates/gpui_linux/src/linux/wayland/window.rs: WaylandWindow::activate_with_token + activate() keyboard-serial fix Plus the focus-serial fix: - serial.rs: SerialKind::KeyboardEnter - client.rs: store wl_keyboard.enter serial; latest_serial_of() Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
54 lines
1.9 KiB
Rust
54 lines
1.9 KiB
Rust
use schemars::JsonSchema;
|
|
use serde::{Deserialize, Serialize};
|
|
use settings::{RegisterSetting, Settings};
|
|
|
|
#[derive(Deserialize, Debug, Clone, Copy, PartialEq, RegisterSetting)]
|
|
pub struct FileFinderSettings {
|
|
pub file_icons: bool,
|
|
pub modal_max_width: FileFinderWidth,
|
|
pub skip_focus_for_active_in_search: bool,
|
|
pub include_ignored: Option<bool>,
|
|
pub include_channels: bool,
|
|
}
|
|
|
|
impl Settings for FileFinderSettings {
|
|
fn from_settings(content: &settings::SettingsContent) -> Self {
|
|
let file_finder = content.file_finder.as_ref().unwrap();
|
|
|
|
Self {
|
|
file_icons: file_finder.file_icons.unwrap(),
|
|
modal_max_width: file_finder.modal_max_width.unwrap().into(),
|
|
skip_focus_for_active_in_search: file_finder.skip_focus_for_active_in_search.unwrap(),
|
|
include_ignored: match file_finder.include_ignored.unwrap() {
|
|
settings::IncludeIgnoredContent::All => Some(true),
|
|
settings::IncludeIgnoredContent::Indexed => Some(false),
|
|
settings::IncludeIgnoredContent::Smart => None,
|
|
},
|
|
include_channels: file_finder.include_channels.unwrap(),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, PartialEq, Eq, Clone, Copy, Default, Serialize, Deserialize, JsonSchema)]
|
|
#[serde(rename_all = "lowercase")]
|
|
pub enum FileFinderWidth {
|
|
#[default]
|
|
Small,
|
|
Medium,
|
|
Large,
|
|
XLarge,
|
|
Full,
|
|
}
|
|
|
|
impl From<settings::FileFinderWidthContent> for FileFinderWidth {
|
|
fn from(content: settings::FileFinderWidthContent) -> Self {
|
|
match content {
|
|
settings::FileFinderWidthContent::Small => FileFinderWidth::Small,
|
|
settings::FileFinderWidthContent::Medium => FileFinderWidth::Medium,
|
|
settings::FileFinderWidthContent::Large => FileFinderWidth::Large,
|
|
settings::FileFinderWidthContent::XLarge => FileFinderWidth::XLarge,
|
|
settings::FileFinderWidthContent::Full => FileFinderWidth::Full,
|
|
}
|
|
}
|
|
}
|