fix scaling, refactors

wgui/src/event.rs

@@ -133,4 +133,4 @@ pub enum EventListener {
 	MousePress(MousePressCallback),
 	MouseRelease(MouseReleaseCallback),
 	InternalStateChange(InternalStateChangeCallback),
-}
+}

wgui/src/renderer_vk/context.rs

@@ -101,7 +101,7 @@ impl SharedContext {
 				return Ok(key);
 			}
 		}
-		log::debug!("Initializing SharedAtlas for pixel scale {pixel_scale:.1}");
+		log::debug!("Initializing SharedAtlas for pixel scale {pixel_scale:.2}");
 		let text_atlas = TextAtlas::new(self.text_pipeline.clone())?;
 		Ok(self.atlas_map.insert(SharedAtlas {
 			text_atlas,
@@ -143,7 +143,7 @@ impl Context {
 		resolution: [u32; 2],
 		pixel_scale: f32,
 	) -> anyhow::Result<()> {
-		if (self.pixel_scale - pixel_scale).abs() < f32::EPSILON {
+		if (self.pixel_scale - pixel_scale).abs() > f32::EPSILON {
 			self.pixel_scale = pixel_scale;
 			self.shared_ctx_key = shared.atlas_for_pixel_scale(pixel_scale)?;
 		}

wgui/src/renderer_vk/text/mod.rs

@@ -38,7 +38,7 @@ pub(crate) const DEFAULT_METRICS: Metrics = Metrics::new(
 pub struct TextStyle {
 	pub size: Option<f32>,
 	pub line_height: Option<f32>,
-	pub color: Option<drawing::Color>, // TODO: should this be hex?
+	pub color: Option<drawing::Color>,
 	pub style: Option<FontStyle>,
 	pub weight: Option<FontWeight>,
 	pub align: Option<HorizontalAlign>,

wgui/src/widget/mod.rs

@@ -80,7 +80,7 @@ impl WidgetState {
 		(data, obj)
 	}
 
-	fn new(obj: Box<dyn WidgetObj>) -> anyhow::Result<WidgetState> {
+	fn new(obj: Box<dyn WidgetObj>) -> anyhow::Result<Self> {
 		Ok(Self {
 			data: WidgetData {
 				hovered: 0,
@@ -374,4 +374,4 @@ impl WidgetState {
 		}
 		EventResult::Pass
 	}
-}
+}