Added C++ image_blend_border_recolor.

5 files changed, 110 insertions, 3 deletions

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index edb9e2a..135d261 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -51,9 +51,11 @@ image_blend_smooth_solid_same_scaled.c \
 image_blend_border.c \
 cxx/image_blend_border.cc \
 cxx/image_blend_border_cxx.c \
+image_blend_border_recolor.c \
+cxx/image_blend_border_recolor.cc \
+cxx/image_blend_border_recolor_cxx.c \
 image_blend_solid_middle_border.c \
 image_blend_solid_border.c \
-image_blend_border_recolor.c \
 image_map_rotate.c \
 image_map_solid_rotate.c \
 image_map_nearest_rotate.c \
diff --git a/src/bin/cxx/image_blend_border.cc b/src/bin/cxx/image_blend_border.cc
index 1be72c8..18d5dea 100644
--- a/src/bin/cxx/image_blend_border.cc
+++ b/src/bin/cxx/image_blend_border.cc
@@ -15,7 +15,7 @@
 #define EXPEDITE_CXX_TEST_IMPL
 #include "image_blend_border_cxx.c"
 
-efl::eina::list<evas::image> images;
+static efl::eina::list<evas::image> images;
 
 /* standard var */
 static int done = 0;
diff --git a/src/bin/cxx/image_blend_border_recolor.cc b/src/bin/cxx/image_blend_border_recolor.cc
new file mode 100644
index 0000000..94b0d16
--- /dev/null
+++ b/src/bin/cxx/image_blend_border_recolor.cc
@@ -0,0 +1,72 @@
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include "Eo.h"
+#include "Evas.h"
+
+#include "Eo.hh"
+#include "Eina.hh"
+#include "Evas.hh"
+
+#include "main.h"
+
+#define EXPEDITE_CXX_TEST_IMPL
+#include "image_blend_border_recolor_cxx.c"
+
+efl::eina::list<evas::image> images;
+
+/* standard var */
+static int done = 0;
+
+/* setup */
+static void _setup(void)
+{
+   evas::canvas canvas(::eo_ref(G_evas));
+   for (int i = 0; i < OBNUM; i++)
+     {
+        evas::image o(efl::eo::parent = canvas);
+        images.push_back(o);
+        o.file_set(::build_path("bar.png"), "");
+        o.color_set(64, 64, 64, 255);
+        o.border_set(3, 3, 3, 3);
+        o.visibility_set(true);
+     }
+   done = 0;
+}
+
+/* cleanup */
+static void _cleanup(void)
+{
+   images.clear();
+}
+
+/* loop - do things */
+static void _loop(double t, int f)
+{
+   int i = 0;
+   Evas_Coord x, y, w, h, w0, h0;
+   for (auto it = images.begin(), end = images.end(); it != end; it++, i++)
+     {
+        w0 = 80;
+        h0 = 80;
+        w = 5 + ((1.0 + cos((double)(f + (i * 10)) / (7.4 * SLOW) )) * w0 * 2);
+        h = 5 + ((1.0 + sin((double)(f + (i * 19)) / (12.6 * SLOW) )) * h0 * 2);
+        x = (win_w / 2) - (w / 2);
+        x += sin((double)(f + (i * 13)) / (36.7 * SLOW)) * (w0 / 2);
+        y = (win_h / 2) - (h / 2);
+        y += cos((double)(f + (i * 28)) / (43.8 * SLOW)) * (h0 / 2);
+
+        (*it).position_set(x, y);
+        (*it).evas::object::size_set(w, h);
+        (*it).fill_set(0, 0, w, h);
+     }
+   FPS_STD(NAME);
+}
+
+/* prepend special key handlers if interactive (before STD) */
+static void _key(char *key)
+{
+   KEY_STD;
+}
diff --git a/src/bin/cxx/image_blend_border_recolor_cxx.c b/src/bin/cxx/image_blend_border_recolor_cxx.c
new file mode 100644
index 0000000..b8685ba
--- /dev/null
+++ b/src/bin/cxx/image_blend_border_recolor_cxx.c
@@ -0,0 +1,32 @@
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#undef FNAME
+#undef NAME
+#undef ICON
+
+/* metadata */
+#define FNAME image_blend_border_recolor_cxx_start
+#define NAME "Image Blend Border Recolor (C++)"
+#define ICON "blend.png"
+
+#ifdef UI
+_ui_menu_item_add(ICON, NAME, FNAME);
+#endif
+
+#ifdef PROTO
+void FNAME(void);
+#endif
+
+#ifndef EXPEDITE_CXX_TEST_IMPL
+#undef FNAME
+#undef NAME
+#undef ICON
+#endif
+
+#ifdef __cplusplus
+}
+#endif
+
diff --git a/src/bin/tests.h b/src/bin/tests.h
index bbc5929..338c0f2 100644
--- a/src/bin/tests.h
+++ b/src/bin/tests.h
@@ -5,6 +5,7 @@ extern "C" {
 
 // C++ tests
 #include "cxx/image_blend_border_cxx.c"
+#include "cxx/image_blend_border_recolor_cxx.c"
 
 // C tests
 /* #include "widgets_file_icons.c" */
@@ -38,9 +39,9 @@ extern "C" {
 /* #include "image_blend_smooth_same_scaled.c" */
 /* #include "image_blend_smooth_solid_same_scaled.c" */
 #include "image_blend_border.c"
+#include "image_blend_border_recolor.c"
 /* #include "image_blend_solid_middle_border.c" */
 /* #include "image_blend_solid_border.c" */
-/* #include "image_blend_border_recolor.c" */
 /* #include "image_map_rotate.c" */
 /* #include "image_map_solid_rotate.c" */
 /* #include "image_map_nearest_rotate.c" */