From 2ddd217737ab4fc23eaf535fbd35573f84a78658 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@puri.sm>
Date: Fri, 12 Jul 2019 19:16:21 +0200
Subject: [PATCH 1/5] Add Enter and Shift icons

---
 data/icons/key-enter.svg | 10 ++++++++++
 data/icons/key-shift.svg |  8 ++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 data/icons/key-enter.svg
 create mode 100644 data/icons/key-shift.svg

diff --git a/data/icons/key-enter.svg b/data/icons/key-enter.svg
new file mode 100644
index 00000000..8489dc32
--- /dev/null
+++ b/data/icons/key-enter.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"
+     version="1.1" viewBox="0 0 24 24">
+   
+    <path d="M 24,1 L 24,10 C 24,15 20,17 17,17 L 7,17 L 10,20 L 10,23
+             L 7,23 L 0,15 L 7,7 L 10,7 L 10,10 L 7,13 L 17,13
+             C 19,13 20,12 20,10 L 20,1 Z"
+          stroke="none" fill="black" />
+</svg>
diff --git a/data/icons/key-shift.svg b/data/icons/key-shift.svg
new file mode 100644
index 00000000..3dc64b04
--- /dev/null
+++ b/data/icons/key-shift.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+
+<svg xmlns="http://www.w3.org/2000/svg" height="24" width="24"
+     version="1.1" viewBox="0 0 24 24">
+   
+    <path d="M 12,2 L 22,14 L 16,14 L 16,22 L 8,22 L 8,14 L 2,14 Z"
+          stroke="none" fill="black" />
+</svg>

From 469b0c0a9ad1493c14c4bb8d350a23b921f3106e Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@puri.sm>
Date: Fri, 12 Jul 2019 20:04:02 +0200
Subject: [PATCH 2/5] Add icons to the resource manifest

---
 data/squeekboard.gresources.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/data/squeekboard.gresources.xml b/data/squeekboard.gresources.xml
index 106e050f..f1d72c41 100644
--- a/data/squeekboard.gresources.xml
+++ b/data/squeekboard.gresources.xml
@@ -32,5 +32,7 @@
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/ug.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/us.xml</file>
    <file compressed="true" preprocess="xml-stripblanks">keyboards/symbols/zh-bopomofo.xml</file>
+   <file>icons/key-enter.svg</file>
+   <file>icons/key-shift.svg</file>
   </gresource>
 </gresources>

From 2774c1c9880e5cba6c2f250570925c19236141fa Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@puri.sm>
Date: Fri, 12 Jul 2019 20:04:22 +0200
Subject: [PATCH 3/5] Try to load icons from app resources first

---
 eek/eek-gtk-renderer.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/eek/eek-gtk-renderer.c b/eek/eek-gtk-renderer.c
index b00d2361..ce46f9fb 100644
--- a/eek/eek-gtk-renderer.c
+++ b/eek/eek-gtk-renderer.c
@@ -60,6 +60,20 @@ eek_gtk_renderer_real_get_icon_surface (EekRenderer *self,
     GError *error = NULL;
     cairo_surface_t *surface;
 
+    gchar *path = g_strconcat("/sm/puri/squeekboard/icons/", icon_name, ".svg", NULL);
+
+    pixbuf = gdk_pixbuf_new_from_resource_at_scale (path, size, size,
+                                                    TRUE, &error);
+
+    if (pixbuf != NULL)
+        goto found;
+    else {
+        g_warning ("can't get icon pixbuf for %s: %s", path, error->message);
+        g_error_free (error);
+        error = NULL;
+    }
+    g_free(path);
+
     pixbuf = gtk_icon_theme_load_icon (gtk_icon_theme_get_default (),
                                        icon_name,
                                        size,
@@ -73,6 +87,7 @@ eek_gtk_renderer_real_get_icon_surface (EekRenderer *self,
         return NULL;
     }
 
+found:
     surface = pixbuf_to_cairo_surface (pixbuf);
     g_object_unref (pixbuf);
     return surface;

From 63f4c6b4daca54e27ca74726802664cf9224d1f4 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@puri.sm>
Date: Fri, 12 Jul 2019 20:04:50 +0200
Subject: [PATCH 4/5] Use icons for Shift and Return in the US layout

---
 data/keyboards/symbols/us.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/keyboards/symbols/us.xml b/data/keyboards/symbols/us.xml
index 1a584c13..62b80595 100644
--- a/data/keyboards/symbols/us.xml
+++ b/data/keyboards/symbols/us.xml
@@ -234,11 +234,11 @@
     <keysym keyval="34">quotedbl</keysym>
   </key>
   <key keycode="36" name="RTRN">
-    <keysym keyval="65293">Return</keysym>
+    <keysym keyval="65293" icon="key-enter">Return</keysym>
   </key>
   <key keycode="50" name="LFSH">
-    <keysym keyval="65505">Shift_L</keysym>
-    <keysym keyval="65505">Shift_L</keysym>
+    <keysym keyval="65505" icon="key-shift">Shift_L</keysym>
+    <keysym keyval="65505" icon="key-shift">Shift_L</keysym>
     <keysym keyval="65505" label="=/+">Shift_L</keysym>
     <keysym keyval="65505" label="123">Shift_L</keysym>
   </key>

From fb5ec5557b1a55b4acd6d21a13eff12468b3eec9 Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@puri.sm>
Date: Fri, 12 Jul 2019 20:12:09 +0200
Subject: [PATCH 5/5] Make icons smaller

---
 eek/eek-renderer.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eek/eek-renderer.c b/eek/eek-renderer.c
index 840f8882..f0dd0097 100644
--- a/eek/eek-renderer.c
+++ b/eek/eek-renderer.c
@@ -497,7 +497,7 @@ render_key (EekRenderer *self,
     if (!symbol)
         return;
 
- #define SCALE 0.5
+ #define SCALE 0.4
     if (eek_symbol_get_icon_name (symbol)) {
 
         cairo_surface_t *icon_surface =