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

Merge remote-tracking branch 'origin/main' into surfaces

Browse source 
# Conflicts:
#	crates/ui2/src/components/avatar.rs
This commit is contained in:
Antonio Scandurra 2023-11-30 10:43:45 +01:00
commit cc0bc444b1
139 changed files with 8384 additions and 6398 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crates/gpui2/src/geometry.rs
View file

@ -740,7 +740,7 @@ impl<T> Copy for Corners<T> where T: Copy + Clone + Default + Debug {}
Deserialize,
)]
#[repr(transparent)]
pub struct Pixels(pub(crate) f32);
pub struct Pixels(pub f32);
impl std::ops::Div for Pixels {
type Output = f32;
@ -1052,7 +1052,7 @@ impl sqlez::bindable::Bind for GlobalPixels {
}
#[derive(Clone, Copy, Default, Add, Sub, Mul, Div, Neg)]
pub struct Rems(f32);
pub struct Rems(pub f32);
impl Mul<Pixels> for Rems {
type Output = Pixels;