From c1ac8e05a359e22f8763e24d8dcfae8059d94b19 Mon Sep 17 00:00:00 2001
From: Boris Faure <billiob@gmail.com>
Date: Tue, 12 May 2020 23:50:22 +0200
Subject: [PATCH] color preview: have a better background

---
 data/themes/default.edc               |   1 +
 data/themes/default/color_preview.edc |  28 ++++++++++++++++++++++++++
 data/themes/images/tiles.png          | Bin 0 -> 3026 bytes
 data/themes/meson.build               |   1 +
 src/bin/termio.c                      |  13 ++++++------
 5 files changed, 37 insertions(+), 6 deletions(-)
 create mode 100644 data/themes/default/color_preview.edc
 create mode 100644 data/themes/images/tiles.png

diff --git a/data/themes/default.edc b/data/themes/default.edc
index 7b5b188c..217d0ba8 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -32,4 +32,5 @@ collections {
    #include "default/about.edc"
    #include "default/fontpreview.edc"
    #include "default/tab_drag_thumb.edc"
+   #include "default/color_preview.edc"
 }
diff --git a/data/themes/default/color_preview.edc b/data/themes/default/color_preview.edc
new file mode 100644
index 00000000..ae9d93c1
--- /dev/null
+++ b/data/themes/default/color_preview.edc
@@ -0,0 +1,28 @@
+group { name: "terminology/color_preview";
+   images.image: "pm_overlay.png" COMP;
+   images.image: "tiles.png" COMP;
+   parts {
+      part { name: "tiles";
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            image.normal: "tiles.png";
+            fill.type: TILE;
+         }
+      }
+      part { name: "preview"; type: RECT;
+         mouse_events: 1;
+         description { state: "default" 0.0;
+            color_class: "color_preview";
+         }
+      }
+      part { name: "overlay";
+         mouse_events: 0;
+         description { state: "default" 0.0;
+            fixed: 1 1;
+            image.normal: "pm_overlay.png";
+            fill.smooth: 0;
+         }
+      }
+   }
+}
diff --git a/data/themes/images/tiles.png b/data/themes/images/tiles.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e92bd15faba8f14ca68fa89fa7af5d3d9d37d6a
GIT binary patch
literal 3026
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
Nh_eF$Uw(*`{9h)$Fb@C#

literal 0
HcmV?d00001

diff --git a/data/themes/meson.build b/data/themes/meson.build
index 9e849d2b..845ee5fd 100644
--- a/data/themes/meson.build
+++ b/data/themes/meson.build
@@ -24,6 +24,7 @@ default_deps = [
   'default/about.edc',
   'default/fontpreview.edc',
   'default/tab_drag_thumb.edc',
+  'default/color_preview.edc',
   ]
 mild_deps = ['mild.edc', 'default/colors.edc']
 edje_to_compile = [
diff --git a/src/bin/termio.c b/src/bin/termio.c
index fb5d16cc..8e70598f 100644
--- a/src/bin/termio.c
+++ b/src/bin/termio.c
@@ -1350,14 +1350,15 @@ _color_tooltip_content(void *data,
 {
    Termio *sd = data;
    Evas_Object *o;
+   Evas *canvas = evas_object_evas_get(obj);
 
-   o = evas_object_rectangle_add(evas_object_evas_get(obj));
+   o = edje_object_add(canvas);
+   theme_apply(o, sd->config, "terminology/color_preview");
    evas_object_size_hint_min_set(o, 80, 80);
-   evas_object_color_set(o,
-                         sd->link.color.r,
-                         sd->link.color.g,
-                         sd->link.color.b,
-                         sd->link.color.a);
+   edje_object_color_class_set(o, "color_preview",
+       sd->link.color.r, sd->link.color.g, sd->link.color.b, sd->link.color.a,
+       sd->link.color.r, sd->link.color.g, sd->link.color.b, sd->link.color.a,
+       sd->link.color.r, sd->link.color.g, sd->link.color.b, sd->link.color.a);
    return o;
 }