Add Eo classes workarround for disabiling ector

src/bindings/cxx/meson.build

@@ -63,15 +63,22 @@ foreach lib : cxx_sublibs
     endif
     subdir_file_location = join_paths(file_location, eo_file_subdir)
     foreach cxx_gen_file : cxx_pub_eo_files
+      if package_name in ['evas', 'efl'] and cxx_gen_file in pub_eo_files_optional_ector
+        cxx_gen_file_input = cxx_gen_file
+        cxx_gen_file = '@0@'.format(cxx_gen_file)
+        cxx_gen_file = cxx_gen_file.split('/')[-1]
+      else
+        cxx_gen_file_input = subdir_file_location / cxx_gen_file
+      endif
       cxx_generator_target += custom_target('eolian_cxx_gen_'+cxx_gen_file.underscorify()+'',
-        input : join_paths(subdir_file_location, cxx_gen_file),
+        input : cxx_gen_file_input,
         output : [cxx_gen_file + '.hh', cxx_gen_file + '.impl.hh'],
         install : true,
         install_dir : join_paths(dir_include, package_version_name, eo_file_subdir),
         command : [eolian_cxx_gen, '-I', meson.current_source_dir(), eolian_include_directories,
                                    '-o', join_paths(meson.current_build_dir(), cxx_gen_file + '.hh'),
                                    '@INPUT@'])
-      eo_file_list += files(join_paths(subdir_file_location, cxx_gen_file))
+      eo_file_list += files(cxx_gen_file_input)
     endforeach
   endforeach
 

src/bindings/mono/meson.build

@@ -92,13 +92,21 @@ foreach lib : mono_sublibs
 
       subdir_file_location = join_paths(file_location, eo_file_subdir)
       foreach mono_gen_file : mono_pub_eo_files
+
+        if package_name in ['evas', 'efl'] and mono_gen_file in pub_eo_files_optional_ector
+          mono_gen_file_input = mono_gen_file
+          mono_gen_file = '@0@'.format(mono_gen_file)
+          mono_gen_file = mono_gen_file.split('/')[-1]
+        else
+          mono_gen_file_input = subdir_file_location / mono_gen_file
+        endif
         if not blacklisted_files.contains(mono_gen_file)
           partial = []
           if manual_inheritance_files.contains(mono_gen_file)
             partial = '-p'
           endif
           mono_generator_target += custom_target('eolian_mono_gen_'+mono_gen_file.underscorify()+'',
-            input : join_paths(subdir_file_location, mono_gen_file),
+            input : mono_gen_file_input,
             output : [mono_gen_file + '.cs'],
             command : [eolian_mono_gen, beta_option, '-I', meson.current_source_dir(), eolian_include_directories,
                                        '--dllimport', package_name,

src/lib/efl/interfaces/efl_text_style.eo_non_vg

@@ -0,0 +1,282 @@
+enum Efl.Text_Style_Background_Type
+{
+   [[Type of background to use behind each line of text.
+
+     @since 1.24
+   ]]
+   none = 0,    [[Do not use background.]]
+   solid_color, [[Use a solid-color rectangle as background.
+                  Requires @Efl.Text_Style.text_background_color.]]
+}
+
+enum Efl.Text_Style_Strikethrough_Type
+{
+   [[Whether to add a strike-through decoration to the displayed text or not.
+     @since 1.24
+   ]]
+   none = 0, [[Do not use strike-through.]]
+   single,   [[Strike-through with a single line.
+               Requires @Efl.Text_Style.text_strikethrough_color.]]
+}
+
+enum Efl.Text_Style_Effect_Type
+{
+   [[Effect to apply to the displayed text.
+     @since 1.24
+   ]]
+   none = 0,            [[No effect.]]
+   shadow,              [[Shadow effect.
+                          Uses @Efl.Text_Style.text_shadow_color and @Efl.Text_Style.text_shadow_direction.]]
+   far_shadow,          [[Far shadow effect.
+                          Uses @Efl.Text_Style.text_shadow_color and @Efl.Text_Style.text_shadow_direction.]]
+   soft_shadow,         [[Soft shadow effect.
+                          Uses @Efl.Text_Style.text_shadow_color and @Efl.Text_Style.text_shadow_direction.]]
+   far_soft_shadow,     [[Far and soft shadow effect.
+                          Uses @Efl.Text_Style.text_shadow_color and @Efl.Text_Style.text_shadow_direction.]]
+   glow,                [[Glow effect.
+                          Uses @Efl.Text_Style.text_glow_color and @Efl.Text_Style.text_secondary_glow_color.]]
+   outline,             [[Outline effect.
+                          Uses @Efl.Text_Style.text_outline_color.]]
+   soft_outline,        [[Soft outline effect.
+                          Uses @Efl.Text_Style.text_outline_color.]]
+   outline_shadow,      [[Outline + shadow effect.
+                          Uses @Efl.Text_Style.text_shadow_color, @Efl.Text_Style.text_shadow_direction and
+                          @Efl.Text_Style.text_outline_color.]]
+   outline_soft_shadow, [[Outline + soft shadow effect.
+                          Uses @Efl.Text_Style.text_shadow_color, @Efl.Text_Style.text_shadow_direction and
+                          @Efl.Text_Style.text_outline_color.]]
+}
+
+enum Efl.Text_Style_Shadow_Direction
+{
+   [[Direction of the shadow effect.
+     @since 1.24
+   ]]
+   bottom_right = 0, [[Shadow towards bottom right.]]
+   bottom,           [[Shadow towards bottom.]]
+   bottom_left,      [[Shadow towards bottom left.]]
+   left,             [[Shadow towards left.]]
+   top_left,         [[Shadow towards top left.]]
+   top,              [[Shadow towards top.]]
+   top_right,        [[Shadow towards top right.]]
+   right,            [[Shadow towards right.]]
+}
+
+enum Efl.Text_Style_Underline_Type
+{
+   [[Type of underline for the displayed text.
+     @since 1.24
+   ]]
+   none = 0, [[Text without underline.]]
+   single,   [[Underlined with a single line.
+               Requires @Efl.Text_Style.text_underline_color.]]
+   double,   [[Underlined with a double line.
+               Requires @Efl.Text_Style.text_underline_color and @Efl.Text_Style.text_secondary_underline_color.]]
+   dashed,   [[Underlined with a dashed line.
+               Requires @Efl.Text_Style.text_underline_dashed_color, @Efl.Text_Style.text_underline_dashed_width and
+               @Efl.Text_Style.text_underline_dashed_gap.]]
+}
+
+interface Efl.Text_Style {
+   [[Decorations to add to the text.
+
+     Decorations include text color, glow, outline, underline, strike-through and shadows.
+     @since 1.24
+   ]]
+   c_prefix: efl_text;
+   methods {
+      @property text_color {
+         [[Color of text, excluding all other decorations. By default it is invisible.]]
+         values
+         {
+            r: ubyte; [[Red component.]]
+            g: ubyte; [[Green component.]]
+            b: ubyte; [[Blue component.]]
+            a: ubyte; [[Alpha component.]]
+         }
+      }
+
+      @property text_background_type {
+         [[Type of background to use behind each line of text.]]
+         values
+         {
+            type: Efl.Text_Style_Background_Type; [[Background type.]]
+         }
+      }
+
+      @property text_background_color {
+         [[Color of the background behind each line of text. By default it is invisible.]]
+         values
+         {
+            r: ubyte; [[Red component.]]
+            g: ubyte; [[Green component.]]
+            b: ubyte; [[Blue component.]]
+            a: ubyte; [[Alpha component.]]
+         }
+      }
+
+      @property text_underline_type {
+         [[Type of underline to use for the text.]]
+         values
+         {
+            type: Efl.Text_Style_Underline_Type; [[Underline type.]]
+         }
+      }
+
+      @property text_underline_color
+      {
+         [[Color of the primary underline. By default it is invisible.]]
+         values
+         {
+            r: ubyte; [[Red component.]]
+            g: ubyte; [[Green component.]]
+            b: ubyte; [[Blue component.]]
+            a: ubyte; [[Alpha component.]]
+         }
+      }
+
+      @property text_underline_height
+      {
+         [[Width (in pixels) of the single underline when @.text_underline_type is
+           @Efl.Text_Style_Underline_Type.single.]]
+         values
+         {
+            height: double; [[Underline width in pixels.]]
+         }
+      }
+
+      @property text_underline_dashed_color
+      {
+         [[Color of the dashed underline. Only valid when @.text_underline_type is
+           @Efl.Text_Style_Underline_Type.dashed. By default it is invisible.]]
+         values
+         {
+            r: ubyte; [[Red component.]]
+            g: ubyte; [[Green component.]]
+            b: ubyte; [[Blue component.]]
+            a: ubyte; [[Alpha component.]]
+         }
+      }
+
+      @property text_underline_dashed_width
+      {
+         [[Length (in pixels) of the dashes when @.text_underline_type is
+           @Efl.Text_Style_Underline_Type.dashed.]]
+         values
+         {
+            width: int; [[Dash length in pixels.]]
+         }
+      }
+
+      @property text_underline_dashed_gap
+      {
+         [[Length (in pixels) of the gaps between the dashes when @.text_underline_type is
+           @Efl.Text_Style_Underline_Type.dashed.]]
+         values
+         {
+            gap: int; [[Gap length in pixels.]]
+         }
+      }
+
+      @property text_secondary_underline_color
+      {
+         [[Color of the secondary underline. Only valid when @.text_underline_type is
+           @Efl.Text_Style_Underline_Type.double. By default it is invisible.]]
+         values
+         {
+            r: ubyte; [[Red component.]]
+            g: ubyte; [[Green component.]]
+            b: ubyte; [[Blue component.]]
+            a: ubyte; [[Alpha component.]]
+         }
+      }
+
+      @property text_strikethrough_type {
+         [[Enables crossed-out text.]]
+         values
+         {
+            type: Efl.Text_Style_Strikethrough_Type; [[Strike-through type.]]
+         }
+      }
+
+      @property text_strikethrough_color
+      {
+         [[Color of the line striking through the text. By default it is invisible.]]
+         values
+         {
+            r: ubyte; [[Red component.]]
+            g: ubyte; [[Green component.]]
+            b: ubyte; [[Blue component.]]
+            a: ubyte; [[Alpha component.]]
+         }
+      }
+
+      @property text_effect_type {
+         [[Controls a number of decorations around the text, like shadow, outline
+           and glow, including combinations of them.]]
+         values {
+            type: Efl.Text_Style_Effect_Type; [[Effect type.]]
+         }
+      }
+      @property text_outline_color
+      {
+         [[Color of the text outline. By default it is invisible.]]
+         values
+         {
+            r: ubyte; [[Red component.]]
+            g: ubyte; [[Green component.]]
+            b: ubyte; [[Blue component.]]
+            a: ubyte; [[Alpha component.]]
+         }
+      }
+
+      @property text_shadow_direction
+      {
+         [[Direction of the shadow effect.]]
+         values
+         {
+            type: Efl.Text_Style_Shadow_Direction; [[Shadow direction.]]
+         }
+      }
+
+      @property text_shadow_color
+      {
+         [[Color of the text shadow. By default it is invisible.]]
+         values
+         {
+            r: ubyte; [[Red component.]]
+            g: ubyte; [[Green component.]]
+            b: ubyte; [[Blue component.]]
+            a: ubyte; [[Alpha component.]]
+         }
+      }
+
+      @property text_glow_color
+      {
+         [[Color of the text glow. By default it is invisible.]]
+         values
+         {
+            r: ubyte; [[Red component.]]
+            g: ubyte; [[Green component.]]
+            b: ubyte; [[Blue component.]]
+            a: ubyte; [[Alpha component.]]
+         }
+      }
+
+      @property text_secondary_glow_color
+      {
+         [[Color of the secondary glow decoration.
+           This is the color of the inner glow (where it touches the text) which
+           gradually fades into @.text_glow_color as it reaches the outer edge.
+           By default it is invisible.
+         ]]
+         values
+         {
+            r: ubyte; [[Red component.]]
+            g: ubyte; [[Green component.]]
+            b: ubyte; [[Blue component.]]
+            a: ubyte; [[Alpha component.]]
+         }
+      }
+   }
+}

src/lib/efl/interfaces/efl_text_style.eo → src/lib/efl/interfaces/efl_text_style.eo_vg

@@ -279,16 +279,16 @@ interface Efl.Text_Style {
          }
       }
 
-      // @property text_gfx_filter
-      // {
-      //    [[Program that applies a special filter
+      @property text_gfx_filter
+      {
+         [[Program that applies a special filter
 
-      //      See @Efl.Gfx.Filter.
-      //    ]]
-      //    values
-      //    {
-      //       code: string; [[Filter code.]]
-      //    }
-      // }
+           See @Efl.Gfx.Filter.
+         ]]
+         values
+         {
+            code: string; [[Filter code.]]
+         }
+      }
    }
 }