diff options
author | rabite <rabite@posteo.de> | 2019-02-01 00:21:16 +0100 |
---|---|---|
committer | rabite <rabite@posteo.de> | 2019-02-01 00:21:16 +0100 |
commit | b7bbcff2840f5b0b0b46f9188ae45be0075f9864 (patch) | |
tree | bc7dc7322403b4cd7c48e26bf8f77dc2a02f8171 /src/coordinates.rs | |
parent | 305d26d7b6ca2f4b3b289365d3f4d56bb2930d95 (diff) |
lots of stuff.
Diffstat (limited to 'src/coordinates.rs')
-rw-r--r-- | src/coordinates.rs | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/src/coordinates.rs b/src/coordinates.rs index 6283cdf..ee9916e 100644 --- a/src/coordinates.rs +++ b/src/coordinates.rs @@ -1,10 +1,9 @@ -#[derive(Debug,Clone,PartialEq)] -pub struct Size(pub (u16,u16)); -#[derive(Debug,Clone,PartialEq)] -pub struct Position(pub (u16,u16)); +#[derive(Debug, Clone, PartialEq)] +pub struct Size(pub (u16, u16)); +#[derive(Debug, Clone, PartialEq)] +pub struct Position(pub (u16, u16)); - -#[derive(Debug,Clone,PartialEq)] +#[derive(Debug, Clone, PartialEq)] pub struct Coordinates { pub size: Size, pub position: Position, @@ -12,12 +11,16 @@ pub struct Coordinates { impl Coordinates { pub fn new() -> Coordinates { - Coordinates { size: Size ((1,1)), position: Position ((1,1)) } - } - pub fn size(&self) -> &Size { - &self.size + Coordinates { + size: Size((1, 1)), + position: Position((1, 1)), + } } + // pub fn size(&self) -> &Size { + // &self.size + // } + pub fn xsize(&self) -> u16 { self.size.xsize() } @@ -34,11 +37,11 @@ impl Coordinates { self.position().clone() } -// pub fn left(&self) -> / + // pub fn left(&self) -> / } impl Size { - pub fn size(&self) -> (u16,u16) { + pub fn size(&self) -> (u16, u16) { self.0 } pub fn xsize(&self) -> u16 { @@ -50,13 +53,13 @@ impl Size { } impl Position { - pub fn position(&self) -> (u16,u16) { + pub fn position(&self) -> (u16, u16) { self.0 } pub fn x(&self) -> u16 { (self.0).1 } - pub fn y(&self) -> u16 { - (self.0).1 - } + // pub fn y(&self) -> u16 { + // (self.0).1 + // } } |