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

settings_ui: Correct stepper increment and enforce max value for Centered Layout Padding (#40751)

Browse Source 
Closes #40748

This PR improves the Centered Layout Padding in settings ui by limiting the numeric stepper to be within valid values and adding a custom schema generated to improve the JSON LSP completions and warnings when editing the setting field manually.

Release Notes:

- settings ui: limit stepper increment for centered padding between 0 and 0.4 and increment by 0.05 now

---------

Co-authored by: Anthony Eid <anthony@zed.dev>
This commit is contained in:
Delvin
2025-10-21 19:20:42 +00:00
committed by GitHub
parent a398f80ba6
commit 4b429033e7
5 changed files with 89 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/workspace/src/workspace.rs
+12 -8
View File
@@ -83,7 +83,7 @@ use remote::{
use schemars::JsonSchema;
use serde::Deserialize;
use session::AppSession;
use settings::{Settings, SettingsLocation, update_settings_file};
use settings::{CenteredPaddingSettings, Settings, SettingsLocation, update_settings_file};
use shared_screen::SharedScreen;
use sqlez::{
bindable::{Bind, Column, StaticColumnCount},
@@ -1199,9 +1199,6 @@ struct FollowerView {
}
impl Workspace {
const DEFAULT_PADDING: f32 = 0.2;
const MAX_PADDING: f32 = 0.4;
pub fn new(
workspace_id: Option<WorkspaceId>,
project: Entity<Project>,
@@ -5938,8 +5935,11 @@ impl Workspace {
fn adjust_padding(padding: Option<f32>) -> f32 {
padding
.unwrap_or(Self::DEFAULT_PADDING)
.clamp(0.0, Self::MAX_PADDING)
.unwrap_or(CenteredPaddingSettings::default().0)
.clamp(
CenteredPaddingSettings::MIN_PADDING,
CenteredPaddingSettings::MAX_PADDING,
)
}
fn render_dock(
@@ -6423,8 +6423,12 @@ impl Render for Workspace {
let paddings = if centered_layout {
let settings = WorkspaceSettings::get_global(cx).centered_layout;
(
render_padding(Self::adjust_padding(settings.left_padding)),
render_padding(Self::adjust_padding(settings.right_padding)),
render_padding(Self::adjust_padding(
settings.left_padding.map(|padding| padding.0),
)),
render_padding(Self::adjust_padding(
settings.right_padding.map(|padding| padding.0),
)),
)
} else {
(None, None)