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

Merge branch 'main' into project_search_design

Browse source
This commit is contained in:
Piotr Osiewicz 2023-08-12 21:57:21 +02:00
commit 6be73e46bf
41 changed files with 528 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

8
crates/workspace/src/pane.rs
View file

@ -409,10 +409,10 @@ impl Pane {
let tooltip_label;
if pane.is_zoomed() {
icon_path = "icons/minimize_8.svg";
tooltip_label = "Zoom In".into();
tooltip_label = "Zoom In";
} else {
icon_path = "icons/maximize_8.svg";
tooltip_label = "Zoom In".into();
tooltip_label = "Zoom In";
}
Pane::render_tab_bar_button(
@ -1503,7 +1503,7 @@ impl Pane {
bounds: square,
background: Some(color),
border: Default::default(),
corner_radius: diameter / 2.,
corner_radii: (diameter / 2.).into(),
});
}
})
@ -1583,7 +1583,7 @@ impl Pane {
index: usize,
icon: &'static str,
is_active: bool,
tooltip: Option<(String, Option<Box<dyn Action>>)>,
tooltip: Option<(&'static str, Option<Box<dyn Action>>)>,
cx: &mut ViewContext<Pane>,
on_click: F1,
on_down: F2,

2
crates/workspace/src/pane/dragged_item_receiver.rs
View file

@ -61,7 +61,7 @@ where
bounds: overlay_region,
background: Some(overlay_color(cx)),
border: Default::default(),
corner_radius: 0.,
corner_radii: Default::default(),
});
});
}

6
crates/workspace/src/workspace.rs
View file

@ -3614,7 +3614,7 @@ fn notify_of_new_dock(workspace: &WeakViewHandle<Workspace>, cx: &mut AsyncAppCo
bounds,
background: Some(code_span_background_color),
border: Default::default(),
corner_radius: 2.0,
corner_radii: (2.0).into(),
})
})
.into_any()
@ -4067,10 +4067,10 @@ pub fn restart(_: &Restart, cx: &mut AppContext) {
// If the user cancels any save prompt, then keep the app open.
for window in workspace_windows {
if let Some(close) = window.update_root(&mut cx, |workspace, cx| {
if let Some(should_close) = window.update_root(&mut cx, |workspace, cx| {
workspace.prepare_to_close(true, cx)
}) {
if !close.await? {
if !should_close.await? {
return Ok(());
}
}