billiob pushed a commit to branch master.
http://git.enlightenment.org/apps/terminology.git/commit/?id=c1ac8e05a359e22f8763e24d8dcfae8059d94b19
commit c1ac8e05a359e22f8763e24d8dcfae8059d94b19
Author: Boris Faure <bill...@gmail.com>
Date: Tue May 12 23:50:22 2020 +0200
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(-)
diff --git a/data/themes/default.edc b/data/themes/default.edc
index 7b5b188..217d0ba 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 0000000..ae9d93c
--- /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 0000000..7e92bd1
Binary files /dev/null and b/data/themes/images/tiles.png differ
diff --git a/data/themes/meson.build b/data/themes/meson.build
index 9e849d2..845ee5f 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 fb5d16c..8e70598 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;
}
--
