From b549b509c9454944dc629c4510b7f7e92ec21085 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Fri, 10 Apr 2020 01:34:22 +0200
Subject: Align text in `iced_wgpu` on a case-by-case basis

---
 wgpu/src/renderer/widget/checkbox.rs   |  6 +++++-
 wgpu/src/renderer/widget/text.rs       | 14 +++++++++++++-
 wgpu/src/renderer/widget/text_input.rs |  1 +
 3 files changed, 19 insertions(+), 2 deletions(-)

(limited to 'wgpu/src/renderer/widget')

diff --git a/wgpu/src/renderer/widget/checkbox.rs b/wgpu/src/renderer/widget/checkbox.rs
index ecacf1de..c0f1bf21 100644
--- a/wgpu/src/renderer/widget/checkbox.rs
+++ b/wgpu/src/renderer/widget/checkbox.rs
@@ -38,7 +38,11 @@ impl checkbox::Renderer for Renderer {
                         content: crate::text::CHECKMARK_ICON.to_string(),
                         font: crate::text::BUILTIN_ICONS,
                         size: bounds.height * 0.7,
-                        bounds,
+                        bounds: Rectangle {
+                            x: bounds.center_x(),
+                            y: bounds.center_y(),
+                            ..bounds
+                        },
                         color: style.checkmark_color,
                         horizontal_alignment: HorizontalAlignment::Center,
                         vertical_alignment: VerticalAlignment::Center,
diff --git a/wgpu/src/renderer/widget/text.rs b/wgpu/src/renderer/widget/text.rs
index 33e549cd..80bff574 100644
--- a/wgpu/src/renderer/widget/text.rs
+++ b/wgpu/src/renderer/widget/text.rs
@@ -31,11 +31,23 @@ impl text::Renderer for Renderer {
         horizontal_alignment: HorizontalAlignment,
         vertical_alignment: VerticalAlignment,
     ) -> Self::Output {
+        let x = match horizontal_alignment {
+            iced_native::HorizontalAlignment::Left => bounds.x,
+            iced_native::HorizontalAlignment::Center => bounds.center_x(),
+            iced_native::HorizontalAlignment::Right => bounds.x + bounds.width,
+        };
+
+        let y = match vertical_alignment {
+            iced_native::VerticalAlignment::Top => bounds.y,
+            iced_native::VerticalAlignment::Center => bounds.center_y(),
+            iced_native::VerticalAlignment::Bottom => bounds.y + bounds.height,
+        };
+
         (
             Primitive::Text {
                 content: content.to_string(),
                 size: f32::from(size),
-                bounds,
+                bounds: Rectangle { x, y, ..bounds },
                 color: color.unwrap_or(defaults.text.color),
                 font,
                 horizontal_alignment,
diff --git a/wgpu/src/renderer/widget/text_input.rs b/wgpu/src/renderer/widget/text_input.rs
index 1f804a1a..6f72db68 100644
--- a/wgpu/src/renderer/widget/text_input.rs
+++ b/wgpu/src/renderer/widget/text_input.rs
@@ -109,6 +109,7 @@ impl text_input::Renderer for Renderer {
             },
             font,
             bounds: Rectangle {
+                y: text_bounds.center_y(),
                 width: f32::INFINITY,
                 ..text_bounds
             },
-- 
cgit