Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "settings: Remove auxiliary Content types where possible (#16744)" (#17768)

Browse source 
This breaks setting `{"scrollbar": {"show":"never"}}`
Release Notes:

- N/A
This commit is contained in:
Conrad Irwin 2024-09-12 14:46:08 -04:00 • committed by GitHub
parent 3b37db4140
commit 4d26f83d23
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
49 changed files with 686 additions and 833 deletions
Download patch file Download diff file Expand all files Collapse all files

18
crates/tasks_ui/src/settings.rs
View file

@ -2,26 +2,22 @@ use schemars::JsonSchema;
use serde::{Deserialize, Serialize};
use settings::{Settings, SettingsSources};
#[derive(Clone, Serialize, Deserialize, PartialEq, JsonSchema)]
#[serde(default)]
/// Task-related settings.
#[derive(Serialize, Deserialize, PartialEq, Default)]
pub(crate) struct TaskSettings {
/// Whether to show task status indicator in the status bar. Default: true
pub(crate) show_status_indicator: bool,
}
impl Default for TaskSettings {
fn default() -> Self {
Self {
show_status_indicator: true,
}
}
/// Task-related settings.
#[derive(Serialize, Deserialize, PartialEq, Default, Clone, JsonSchema)]
pub(crate) struct TaskSettingsContent {
/// Whether to show task status indicator in the status bar. Default: true
show_status_indicator: Option<bool>,
}
impl Settings for TaskSettings {
const KEY: Option<&'static str> = Some("task");
type FileContent = Self;
type FileContent = TaskSettingsContent;
fn load(
sources: SettingsSources<Self::FileContent>,