From 5a5ca34b5fcab9266359d3f0885782969f8c058e Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sat, 5 Oct 2019 19:22:51 +0200
Subject: Modularize `iced_wgpu`

---
 wgpu/src/primitive.rs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 wgpu/src/primitive.rs

(limited to 'wgpu/src/primitive.rs')

diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs
new file mode 100644
index 00000000..04b2e99f
--- /dev/null
+++ b/wgpu/src/primitive.rs
@@ -0,0 +1,14 @@
+use iced_native::Rectangle;
+
+#[derive(Debug, Clone)]
+pub enum Primitive {
+    None,
+    Group {
+        primitives: Vec<Primitive>,
+    },
+    Text {
+        content: String,
+        bounds: Rectangle,
+        size: f32,
+    },
+}
-- 
cgit 


From 7765e6da50a3448501ee1b639e580c94a4fbda8a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Sun, 6 Oct 2019 19:22:25 +0200
Subject: Draft `Box` primitive

---
 wgpu/src/primitive.rs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'wgpu/src/primitive.rs')

diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs
index 04b2e99f..e9ab100e 100644
--- a/wgpu/src/primitive.rs
+++ b/wgpu/src/primitive.rs
@@ -1,4 +1,4 @@
-use iced_native::Rectangle;
+use iced_native::{Color, Rectangle};
 
 #[derive(Debug, Clone)]
 pub enum Primitive {
@@ -11,4 +11,13 @@ pub enum Primitive {
         bounds: Rectangle,
         size: f32,
     },
+    Box {
+        bounds: Rectangle,
+        background: Background,
+    },
+}
+
+#[derive(Debug, Clone, Copy, PartialEq)]
+pub enum Background {
+    Color(Color),
 }
-- 
cgit 


From 70c17b053b10741f6018b2559bb46c5f289cadb9 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 7 Oct 2019 02:17:40 +0200
Subject: Rename `Box` primitive to `Quad`

---
 wgpu/src/primitive.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'wgpu/src/primitive.rs')

diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs
index e9ab100e..91cdfc85 100644
--- a/wgpu/src/primitive.rs
+++ b/wgpu/src/primitive.rs
@@ -11,7 +11,7 @@ pub enum Primitive {
         bounds: Rectangle,
         size: f32,
     },
-    Box {
+    Quad {
         bounds: Rectangle,
         background: Background,
     },
-- 
cgit 


From c9510db551893775d3233340dd114d971e24323a Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Mon, 7 Oct 2019 03:56:16 +0200
Subject: Render colored quads

---
 wgpu/src/primitive.rs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'wgpu/src/primitive.rs')

diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs
index 91cdfc85..f6730a1f 100644
--- a/wgpu/src/primitive.rs
+++ b/wgpu/src/primitive.rs
@@ -20,4 +20,5 @@ pub enum Primitive {
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum Background {
     Color(Color),
+    // TODO: Add gradient and image variants
 }
-- 
cgit 


From 10e10e5e06841574425d2633f1c2916733f7b4ff Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Tue, 8 Oct 2019 03:13:41 +0200
Subject: Make `iced_core::Button` customizable

Now it supports:
  - Any kind of content
  - Custom border radius
  - Custom background
---
 wgpu/src/primitive.rs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'wgpu/src/primitive.rs')

diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs
index f6730a1f..b664689b 100644
--- a/wgpu/src/primitive.rs
+++ b/wgpu/src/primitive.rs
@@ -1,4 +1,4 @@
-use iced_native::{Color, Rectangle};
+use iced_native::{text, Background, Color, Rectangle};
 
 #[derive(Debug, Clone)]
 pub enum Primitive {
@@ -9,16 +9,14 @@ pub enum Primitive {
     Text {
         content: String,
         bounds: Rectangle,
+        color: Color,
         size: f32,
+        horizontal_alignment: text::HorizontalAlignment,
+        vertical_alignment: text::VerticalAlignment,
     },
     Quad {
         bounds: Rectangle,
         background: Background,
+        border_radius: u16,
     },
 }
-
-#[derive(Debug, Clone, Copy, PartialEq)]
-pub enum Background {
-    Color(Color),
-    // TODO: Add gradient and image variants
-}
-- 
cgit 


From 38b6c84e7761c049b17d178deb9c866386a53946 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Wed, 23 Oct 2019 01:21:23 +0200
Subject: Implement basic image rendering in `iced_wgpu`

---
 wgpu/src/primitive.rs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'wgpu/src/primitive.rs')

diff --git a/wgpu/src/primitive.rs b/wgpu/src/primitive.rs
index b664689b..0b9e2c41 100644
--- a/wgpu/src/primitive.rs
+++ b/wgpu/src/primitive.rs
@@ -19,4 +19,8 @@ pub enum Primitive {
         background: Background,
         border_radius: u16,
     },
+    Image {
+        path: String,
+        bounds: Rectangle,
+    },
 }
-- 
cgit