diff --git a/voxygen/src/ui/ice/renderer/style/checkbox.rs b/voxygen/src/ui/ice/renderer/style/checkbox.rs index ec6f54f768..a113c0911b 100644 --- a/voxygen/src/ui/ice/renderer/style/checkbox.rs +++ b/voxygen/src/ui/ice/renderer/style/checkbox.rs @@ -4,7 +4,7 @@ use super::super::super::widget::image; struct Background { default: image::Handle, hover: image::Handle, - press: image::Handle, + checked: image::Handle, hover_checked: image::Handle, } @@ -13,7 +13,7 @@ impl Background { Self { default: image, hover: image, - press: image, + checked: image, hover_checked: image, } } @@ -22,18 +22,18 @@ impl Background { #[derive(Clone, Copy)] pub struct Style { background: Option, - checked: Option, + check: Option, } impl Style { - pub fn new(image: image::Handle, checked: image::Handle) -> Self { + pub fn new(image: image::Handle, check: image::Handle) -> Self { Self { background: Some(Background::new(image)), - checked: Some(checked), + check: Some(check), } } - pub fn hover_image(mut self, image: image::Handle) -> Self { + pub fn bg_hover_image(mut self, image: image::Handle) -> Self { self.background = Some(match self.background { Some(mut background) => { background.hover = image; @@ -44,10 +44,10 @@ impl Style { self } - pub fn press_image(mut self, image: image::Handle) -> Self { + pub fn bg_checked_image(mut self, image: image::Handle) -> Self { self.background = Some(match self.background { Some(mut background) => { - background.press = image; + background.checked = image; background }, None => Background::new(image), @@ -55,7 +55,7 @@ impl Style { self } - pub fn hover_checked_image(mut self, image: image::Handle) -> Self { + pub fn bg_hover_checked_image(mut self, image: image::Handle) -> Self { self.background = Some(match self.background { Some(mut background) => { background.hover_checked = image; @@ -66,13 +66,15 @@ impl Style { self } - pub fn checked(&self) -> Option { self.checked } + pub fn check(&self) -> Option { self.check } - pub fn bg_check(&self) -> Option { self.background.as_ref().map(|b| b.press) } + pub fn bg_checked(&self) -> Option { + self.background.as_ref().map(|b| b.checked) + } pub fn bg_hover(&self) -> Option { self.background.as_ref().map(|b| b.hover) } - pub fn bg_hover_check(&self) -> Option { + pub fn bg_hover_checked(&self) -> Option { self.background.as_ref().map(|b| b.hover_checked) } @@ -85,7 +87,7 @@ impl Default for Style { fn default() -> Self { Self { background: None, - checked: None, + check: None, } } } diff --git a/voxygen/src/ui/ice/renderer/widget/checkbox.rs b/voxygen/src/ui/ice/renderer/widget/checkbox.rs index bddcfe609e..8641ec7144 100644 --- a/voxygen/src/ui/ice/renderer/widget/checkbox.rs +++ b/voxygen/src/ui/ice/renderer/widget/checkbox.rs @@ -22,8 +22,8 @@ impl checkbox::Renderer for IcedRenderer { }; let background_image = match (is_checked, is_mouse_over) { - (true, true) => style.bg_hover_check(), - (true, false) => style.bg_check(), + (true, true) => style.bg_hover_checked(), + (true, false) => style.bg_checked(), (false, true) => style.bg_hover(), (false, false) => style.bg_default(), }; @@ -41,7 +41,7 @@ impl checkbox::Renderer for IcedRenderer { Primitive::Group { primitives: if is_checked { let check = style - .checked() + .check() .map(|image| Primitive::Image { handle: (image, Rotation::None), bounds,