expedite-cxx: Unfinished widget tests.

src/bin/cxx/widgets_file_icons_2_grouped.cc

@@ -66,7 +66,7 @@ static void _setup(void)
      }
    for (evas::image& img : images)
      {
-        img.raise();
+        img.evas::object::raise();
      }
    efl::eina::list<evas::image>::iterator
      it1 = images.begin(),
@@ -74,7 +74,10 @@ static void _setup(void)
    for (int i = 0; i < NUM; i++, ++it1)
      {
         if (i > 13)
-          (*it1).stack_above(*it2++);
+          {
+             (*it1).evas::object::stack_above(*it2);
+             ++it2; // XXX
+          }
      }
    done = 0;
 }
@@ -83,11 +86,17 @@ static void _setup(void)
 static void _cleanup(void)
 {
    for (evas::image& i : images)
-     i.parent_set(efl::eo::base(nullptr));
+     {
+        i.visibility_set(false); // XXX
+        i.parent_set(efl::eo::base(nullptr));
+     }
    images.clear();
 
    for (evas::text& t : texts)
-     t.parent_set(efl::eo::base(nullptr));
+     {
+        t.visibility_set(false); // XXX
+        t.parent_set(efl::eo::base(nullptr));
+     }
    texts.clear();
 }
 

src/bin/cxx/widgets_file_icons_3.cc

@@ -89,7 +89,7 @@ static void _loop(double t, int f)
    efl::eina::list<evas::text>::iterator
      it2 = texts.begin(),
      end2 = texts.end();
-   for (; it1 != end1 && it2 != end2; ++it1, ++it2)   
+   for (; it1 != end1 && it2 != end2; ++it1, ++it2)
      {
         (*it1).evas::object::position_set(x + 8, y);
         (*it2).evas::object::size_get(&tw, &th);

src/bin/cxx/widgets_list_2_grouped.cc

@@ -116,7 +116,7 @@ static void _loop(double t, int f)
    efl::eina::list<evas::text>::iterator
      it2 = texts.begin(),
      end2 = texts.end();
-   for (int i = 0; i < NUM; i++)
+   for (; it1 != end1 && it2 != end2; ++it1, ++it2)
      {
         (*it1).evas::object::position_set(x, y);
         (*it2).evas::object::size_get(&tw, &th);

src/bin/cxx/widgets_list_3.cc

@@ -143,7 +143,7 @@ static void _loop(double t, int f)
    efl::eina::list<evas::text>::iterator
      it3 = texts.begin(),
      end3 = texts.end();
-   for (int i = 0; i < NUM; i++)
+   while (it1 != end1 && it2 != end2 && it3 != end3)
      {
         (*it1).evas::object::position_set(x, y);
         (*it2).evas::object::position_set(x + 4, y + 4);
@@ -151,6 +151,7 @@ static void _loop(double t, int f)
         cent = (ICON_SIZE - th) / 2;
         (*it3).evas::object::position_set(x + 8 + ICON_SIZE + 8, y + cent);
         y += ICON_SIZE;
+        ++it1; ++it2; ++it3;
      }
    FPS_STD(NAME);
 }

src/bin/cxx/widgets_list_3_grouped.cc

@@ -137,7 +137,7 @@ static void _cleanup(void)
      i.parent_set(efl::eo::base(nullptr));
    images.clear();
 
-   for (int i = 0; i < NUM; i++) // XXX
+   for (int i = 0; i < NUM; ++i) // XXX
      {
         icons[i]->parent_set(efl::eo::base(nullptr));
         icons[i]->_reset(nullptr);