Configurable window decorations (#13866)
Introduces the `ZED_WINDOW_DECORATIONS` env variable. - Not set, defaulting to client-side decorations - Value is "client": client-side decorations - Value is "server": server-side decorations I think it's good to have this escape-hatch next to all possible detection mechanisms. Release Notes: - N/A
This commit is contained in:
parent
9b7bc04a87
commit
fa602001e3
2 changed files with 6 additions and 3 deletions
|
@ -6491,8 +6491,6 @@ pub fn client_side_decorations(element: impl IntoElement, cx: &mut WindowContext
|
||||||
cx.set_client_inset(theme::CLIENT_SIDE_DECORATION_SHADOW);
|
cx.set_client_inset(theme::CLIENT_SIDE_DECORATION_SHADOW);
|
||||||
}
|
}
|
||||||
|
|
||||||
println!("decorations: {:?}", decorations);
|
|
||||||
|
|
||||||
struct GlobalResizeEdge(ResizeEdge);
|
struct GlobalResizeEdge(ResizeEdge);
|
||||||
impl Global for GlobalResizeEdge {}
|
impl Global for GlobalResizeEdge {}
|
||||||
|
|
||||||
|
|
|
@ -90,6 +90,11 @@ pub fn build_window_options(display_uuid: Option<Uuid>, cx: &mut AppContext) ->
|
||||||
.find(|display| display.uuid().ok() == Some(uuid))
|
.find(|display| display.uuid().ok() == Some(uuid))
|
||||||
});
|
});
|
||||||
let app_id = ReleaseChannel::global(cx).app_id();
|
let app_id = ReleaseChannel::global(cx).app_id();
|
||||||
|
let window_decorations = match std::env::var("ZED_WINDOW_DECORATIONS") {
|
||||||
|
Ok(val) if val == "server" => gpui::WindowDecorations::Server,
|
||||||
|
Ok(val) if val == "client" => gpui::WindowDecorations::Client,
|
||||||
|
_ => gpui::WindowDecorations::Client,
|
||||||
|
};
|
||||||
|
|
||||||
WindowOptions {
|
WindowOptions {
|
||||||
titlebar: Some(TitlebarOptions {
|
titlebar: Some(TitlebarOptions {
|
||||||
|
@ -105,7 +110,7 @@ pub fn build_window_options(display_uuid: Option<Uuid>, cx: &mut AppContext) ->
|
||||||
display_id: display.map(|display| display.id()),
|
display_id: display.map(|display| display.id()),
|
||||||
window_background: cx.theme().window_background_appearance(),
|
window_background: cx.theme().window_background_appearance(),
|
||||||
app_id: Some(app_id.to_owned()),
|
app_id: Some(app_id.to_owned()),
|
||||||
window_decorations: Some(gpui::WindowDecorations::Client),
|
window_decorations: Some(window_decorations),
|
||||||
window_min_size: Some(gpui::Size {
|
window_min_size: Some(gpui::Size {
|
||||||
width: px(360.0),
|
width: px(360.0),
|
||||||
height: px(240.0),
|
height: px(240.0),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue