Simpler coord conversions

gridbugs · gridbugs · commit ddc5c5a33f69 · 2025-10-09T22:50:27.000+11:00
diff --git a/widgets/src/switch.rs b/widgets/src/switch.rs
@@ -25,8 +25,7 @@ struct UiButton {
 
 impl UiButton {
     fn contains(&self, mouse_position: Coord) -> bool {
-        self.rect
-            .contains_point((mouse_position.x, mouse_position.y))
+        self.rect.contains_point(mouse_position)
     }
 
     fn render(
@@ -38,10 +37,7 @@ impl UiButton {
         let background = match background {
             Some(background) => background,
             None => {
-                let x = if self
-                    .rect
-                    .contains_point((mouse_position.x, mouse_position.y))
-                {
+                let x = if self.rect.contains_point(mouse_position) {
                     128
                 } else {
                     64

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,7 @@ struct UiButton {`
`25`	`25`
`26`	`26`	`impl UiButton {`
`27`	`27`	`fn contains(&self, mouse_position: Coord) -> bool {`
`28`		`- self.rect`
`29`		`- .contains_point((mouse_position.x, mouse_position.y))`
	`28`	`+ self.rect.contains_point(mouse_position)`
`30`	`29`	`}`
`31`	`30`
`32`	`31`	`fn render(`
`@@ -38,10 +37,7 @@ impl UiButton {`
`38`	`37`	`let background = match background {`
`39`	`38`	`Some(background) => background,`
`40`	`39`	`None => {`
`41`		`- let x = if self`
`42`		`- .rect`
`43`		`- .contains_point((mouse_position.x, mouse_position.y))`
`44`		`- {`
	`40`	`+ let x = if self.rect.contains_point(mouse_position) {`
`45`	`41`	`128`
`46`	`42`	`} else {`
`47`	`43`	`64`