efl: Proper Iup.Fixed container, fix layout/positioning

Author: gen2brain

iup/external/src/efl/iupefl_button.c

@@ -470,6 +470,20 @@ static void eflButtonComputeNaturalSizeMethod(Ihandle* ih, int* w, int* h, int*
 
   (void)children_expand;
 
+  if (!ih->handle)
+  {
+    char* value = iupAttribGet(ih, "IMAGE");
+    if (value)
+    {
+      char* title = iupAttribGet(ih, "TITLE");
+      type = IUP_BUTTON_IMAGE;
+      if (title && *title != 0)
+        type |= IUP_BUTTON_TEXT;
+    }
+    else
+      type = IUP_BUTTON_TEXT;
+  }
+
   if (type & IUP_BUTTON_IMAGE)
   {
     iupImageGetInfo(iupAttribGet(ih, "IMAGE"), &natural_w, &natural_h, NULL);

iup/external/src/efl/iupefl_common.c

@@ -133,8 +133,11 @@ IUP_DRV_API char* iupeflBaseGetActiveAttrib(Ihandle* ih)
 
 IUP_DRV_API void iupeflSetPosSize(Ihandle* ih, int x, int y, int width, int height)
 {
-  Eo* widget = iupeflGetWidget(ih);
+  Eo* widget = (Eo*)iupAttribGet(ih, "_IUP_EXTRAPARENT");
   Eo* bg_rect;
+
+  if (!widget)
+    widget = iupeflGetWidget(ih);
   Ihandle* parent;
   int abs_x, abs_y;
 
@@ -240,18 +243,30 @@ IUP_DRV_API unsigned int iupeflGetDefaultSeat(Eo* widget)
 
 /****************************************************************************
  * Fixed Container (for absolute positioning)
+ *
+ * Concrete Efl.Ui.Widget subclass with no layout logic. Children stay
+ * exactly where IUP positions them, no automatic layout interference.
  ****************************************************************************/
 
+static const Efl_Class_Description _iup_fixed_class_desc = {
+  EO_VERSION,
+  "Iup.Fixed",
+  EFL_CLASS_TYPE_REGULAR,
+  0, NULL, NULL, NULL
+};
+
+EFL_DEFINE_CLASS(iupefl_fixed_class_get, &_iup_fixed_class_desc, EFL_UI_WIDGET_CLASS, NULL)
+
 IUP_DRV_API Eo* iupeflFixedContainerNew(Eo* parent)
 {
-  Eo* box = efl_add(EFL_UI_BOX_CLASS, parent);
-  if (!box)
+  Eo* fixed = efl_add(iupefl_fixed_class_get(), parent);
+  if (!fixed)
     return NULL;
 
-  efl_gfx_hint_weight_set(box, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
-  efl_gfx_hint_align_set(box, -1.0, -1.0);
+  efl_gfx_hint_weight_set(fixed, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
+  efl_gfx_hint_align_set(fixed, -1.0, -1.0);
 
-  return box;
+  return fixed;
 }
 
 IUP_DRV_API void iupeflFixedContainerMove(Eo* container, Eo* child, int x, int y)
@@ -262,14 +277,14 @@ IUP_DRV_API void iupeflFixedContainerMove(Eo* container, Eo* child, int x, int y
 
 IUP_DRV_API Eo* iupeflNativeContainerNew(Eo* parent)
 {
-  Eo* box = efl_add(EFL_UI_BOX_CLASS, parent);
-  if (!box)
+  Eo* fixed = efl_add(iupefl_fixed_class_get(), parent);
+  if (!fixed)
     return NULL;
 
-  efl_gfx_hint_weight_set(box, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
-  efl_gfx_hint_align_set(box, -1.0, -1.0);
+  efl_gfx_hint_weight_set(fixed, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
+  efl_gfx_hint_align_set(fixed, -1.0, -1.0);
 
-  return box;
+  return fixed;
 }
 
 /****************************************************************************
@@ -679,26 +694,6 @@ IUP_SDK_API void iupdrvReparent(Ihandle* ih)
   (void)ih;
 }
 
-static void eflGetAbsolutePosition(Ihandle* ih, int* abs_x, int* abs_y)
-{
-  int x = ih->x;
-  int y = ih->y;
-  Ihandle* parent = ih->parent;
-
-  while (parent)
-  {
-    if (parent->iclass->nativetype != IUP_TYPEVOID)
-    {
-      x += parent->x;
-      y += parent->y;
-    }
-    parent = parent->parent;
-  }
-
-  *abs_x = x;
-  *abs_y = y;
-}
-
 IUP_DRV_API int iupeflIsInsideTabs(Ihandle* ih)
 {
   Ihandle* parent = ih->parent;
@@ -715,31 +710,10 @@ IUP_DRV_API int iupeflIsInsideTabs(Ihandle* ih)
 
 IUP_SDK_API void iupdrvBaseLayoutUpdateMethod(Ihandle* ih)
 {
-  Eo* widget;
-  Eo* container = (Eo*)iupAttribGet(ih, "_IUP_EXTRAPARENT");
-  int abs_x, abs_y;
-
-  widget = container ? container : iupeflGetWidget(ih);
-  if (!widget)
-    return;
-
   if (iupeflIsInsideTabs(ih))
     return;
 
-  eflGetAbsolutePosition(ih, &abs_x, &abs_y);
-
-  iupeflSetPosition(widget, abs_x, abs_y);
-  iupeflSetSize(widget, ih->currentwidth, ih->currentheight);
-
-  {
-    Eo* bg_rect = (Eo*)iupAttribGet(ih, "_IUP_EFL_BGRECT");
-    if (bg_rect)
-    {
-      efl_gfx_entity_position_set(bg_rect, EINA_POSITION2D(abs_x, abs_y));
-      efl_gfx_entity_size_set(bg_rect, EINA_SIZE2D(ih->currentwidth, ih->currentheight));
-      efl_gfx_stack_below(bg_rect, widget);
-    }
-  }
+  iupeflSetPosSize(ih, ih->x, ih->y, ih->currentwidth, ih->currentheight);
 }
 
 IUP_SDK_API void iupdrvBaseUnMapMethod(Ihandle* ih)

iup/external/src/efl/iupefl_drv.h

@@ -140,11 +140,14 @@ IUP_DRV_API int iupeflBaseSetVisibleAttrib(Ihandle* ih, const char* value);
 /* Get the inner container for adding children */
 IUP_DRV_API Eo* iupeflGetInnerContainer(Ihandle* ih);
 
+/* Concrete Efl.Ui.Widget subclass with no automatic layout */
+const Efl_Class* iupefl_fixed_class_get(void);
+
 /* Fixed positioning container */
 IUP_DRV_API Eo* iupeflFixedContainerNew(Eo* parent);
 IUP_DRV_API void iupeflFixedContainerMove(Eo* container, Eo* child, int x, int y);
 
-/* Native container using EFL_UI_BOX_CLASS */
+/* Native container for frame inner area */
 IUP_DRV_API Eo* iupeflNativeContainerNew(Eo* parent);
 
 /****************************************************************************

iup/external/src/efl/iupefl_font.c

@@ -48,6 +48,10 @@ static Evas* eflFontGetMeasureEvas(void)
       return evas_object_evas_get(win);
   }
 
+  efl_font_buffer_ee = ecore_evas_buffer_new(1, 1);
+  if (efl_font_buffer_ee)
+    return ecore_evas_get(efl_font_buffer_ee);
+
   return NULL;
 }
 
@@ -61,23 +65,6 @@ static void eflFontApplyStyle(Eo* tb, const char* family, int size, int is_bold,
   efl_canvas_textblock_style_apply(tb, style);
 }
 
-static IeflFont* eflFontGet(Ihandle* ih)
-{
-  return (IeflFont*)iupAttribGet(ih, "_IUP_EFL_FONT");
-}
-
-IUP_DRV_API void iupeflFontFree(Ihandle* ih)
-{
-  IeflFont* font = eflFontGet(ih);
-  if (font)
-  {
-    if (font->font_name)
-      free(font->font_name);
-    free(font);
-    iupAttribSet(ih, "_IUP_EFL_FONT", NULL);
-  }
-}
-
 static void eflFontParse(const char* value, char* family, int* size, int* is_bold, int* is_italic, int* is_underline, int* is_strikeout)
 {
   const char* p;
@@ -245,6 +232,49 @@ static void eflFontMeasureString(const char* family, int size, int is_bold, int
   if (h) *h = sz.h > 0 ? sz.h : size;
 }
 
+static IeflFont* eflFontGet(Ihandle* ih)
+{
+  IeflFont* font = (IeflFont*)iupAttribGet(ih, "_IUP_EFL_FONT");
+  if (!font && ih)
+  {
+    char* font_str = iupGetFontValue(ih);
+    if (!font_str)
+      font_str = IupGetGlobal("DEFAULTFONT");
+    if (font_str)
+    {
+      char family[100];
+      int size, is_bold, is_italic, is_underline, is_strikeout;
+
+      font = (IeflFont*)calloc(1, sizeof(IeflFont));
+      iupAttribSet(ih, "_IUP_EFL_FONT", (char*)font);
+
+      eflFontParse(font_str, family, &size, &is_bold, &is_italic, &is_underline, &is_strikeout);
+
+      font->font_name = strdup(family);
+      font->size = size;
+      font->is_bold = is_bold;
+      font->is_italic = is_italic;
+      font->is_underline = is_underline;
+      font->is_strikeout = is_strikeout;
+
+      eflFontMeasure(family, size, is_bold, is_italic, &font->charwidth, &font->charheight, &font->ascent, &font->descent);
+    }
+  }
+  return font;
+}
+
+IUP_DRV_API void iupeflFontFree(Ihandle* ih)
+{
+  IeflFont* font = (IeflFont*)iupAttribGet(ih, "_IUP_EFL_FONT");
+  if (font)
+  {
+    if (font->font_name)
+      free(font->font_name);
+    free(font);
+    iupAttribSet(ih, "_IUP_EFL_FONT", NULL);
+  }
+}
+
 IUP_SDK_API int iupdrvSetFontAttrib(Ihandle* ih, const char* value)
 {
   IeflFont* font = eflFontGet(ih);

iup/external/src/efl/iupefl_tabs.c

@@ -330,7 +330,7 @@ IUP_SDK_API int iupdrvTabsExtraDecor(Ihandle* ih)
 
 IUP_SDK_API int iupdrvTabsExtraMargin(void)
 {
-  return 0;
+  return 4;
 }
 
 IUP_SDK_API int iupdrvTabsGetLineCountAttrib(Ihandle* ih)
@@ -733,7 +733,7 @@ static void eflTabsChildAddedMethod(Ihandle* ih, Ihandle* child)
     if (!page)
       return;
 
-    content_box = efl_add(EFL_UI_BOX_CLASS, page);
+    content_box = efl_add(iupefl_fixed_class_get(), page);
     if (content_box)
     {
       efl_gfx_hint_weight_set(content_box, 1.0, 1.0);