mirror of https://github.com/sgoudham/neovide.git
refactor: Use paired values as tuples/Dimensions
Paired values, like width/height now using tuples and Dimensions. `Dimensions` struct implements traits for multiplication and division, which allows us to scale grid size to physical and back just by multiplying `Dimensions` instead of each variable. Also, added trait for multiplication (u64, u64) by Dimensions. For the same purpose as above.macos-click-through
Serg Tereshchenko
3 years ago
parent
725f12cafd
commit
6d38f34f8b
@ -0,0 +1,83 @@
|
||||
use glutin::dpi::PhysicalSize;
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::ops::{Div, Mul};
|
||||
|
||||
// Maybe this should be independent from serialization?
|
||||
#[derive(Debug, Clone, Copy, Eq, PartialEq, Serialize, Deserialize)]
|
||||
pub struct Dimensions {
|
||||
pub width: u64,
|
||||
pub height: u64,
|
||||
}
|
||||
|
||||
macro_rules! impl_from_tuple_to_dimensions {
|
||||
($type:ty) => {
|
||||
impl From<($type, $type)> for Dimensions {
|
||||
fn from((width, height): ($type, $type)) -> Self {
|
||||
Dimensions {
|
||||
width: width as u64,
|
||||
height: height as u64,
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
macro_rules! impl_from_dimensions_to_tuple {
|
||||
($type:ty) => {
|
||||
impl From<Dimensions> for ($type, $type) {
|
||||
fn from(dimensions: Dimensions) -> Self {
|
||||
(dimensions.width as $type, dimensions.height as $type)
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
impl_from_tuple_to_dimensions!(u64);
|
||||
impl_from_tuple_to_dimensions!(f32);
|
||||
|
||||
impl_from_dimensions_to_tuple!(u64);
|
||||
impl_from_dimensions_to_tuple!(u32);
|
||||
impl_from_dimensions_to_tuple!(i32);
|
||||
|
||||
impl From<PhysicalSize<u32>> for Dimensions {
|
||||
fn from(PhysicalSize { width, height }: PhysicalSize<u32>) -> Self {
|
||||
Dimensions {
|
||||
width: width as u64,
|
||||
height: height as u64,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl From<Dimensions> for PhysicalSize<u32> {
|
||||
fn from(Dimensions { width, height }: Dimensions) -> Self {
|
||||
PhysicalSize {
|
||||
width: width as u32,
|
||||
height: height as u32,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Mul for Dimensions {
|
||||
type Output = Self;
|
||||
|
||||
fn mul(self, other: Self) -> Self {
|
||||
Dimensions::from((self.width * other.width, self.height * other.height))
|
||||
}
|
||||
}
|
||||
|
||||
impl Div for Dimensions {
|
||||
type Output = Self;
|
||||
|
||||
fn div(self, other: Self) -> Self {
|
||||
Dimensions::from((self.width / other.width, self.height / other.height))
|
||||
}
|
||||
}
|
||||
|
||||
impl Mul<Dimensions> for (u64, u64) {
|
||||
type Output = Self;
|
||||
|
||||
fn mul(self, other: Dimensions) -> Self {
|
||||
let (x, y) = self;
|
||||
(x * other.width, y * other.height)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,3 @@
|
||||
mod dimensions;
|
||||
|
||||
pub use dimensions::*;
|
||||
Loading…
Reference in New Issue