diff options
| -rw-r--r-- | lib/efl/native/eet.rb | 2 | ||||
| -rw-r--r-- | lib/efl/native/eina_log.rb | 4 | ||||
| -rw-r--r-- | lib/efl/native/evas.rb | 21 | ||||
| -rw-r--r-- | spec/evas_spec.rb | 13 |
4 files changed, 24 insertions, 16 deletions
diff --git a/lib/efl/native/eet.rb b/lib/efl/native/eet.rb index 286e9cb..070a0ef 100644 --- a/lib/efl/native/eet.rb +++ b/lib/efl/native/eet.rb @@ -29,7 +29,7 @@ module Efl :eet_error_invalid_signature, :eet_error_not_signed, :eet_error_not_implemented, :eet_error_prng_not_seeded, :eet_error_encrypt_failed, :eet_error_decrypt_failed ] # typedef enum _Eet_File_Mode {...} Eet_File_Mode; - enum :eet_file_mode, [ :eet_file_mode_invalid, -1, :eet_file_mode_read, :eet_file_mode_write, :eet_file_mode_read_write ] + enum :eet_file_mode, [ :eet_file_mode_invalid, -1, :eet_file_mode_read, 0, :eet_file_mode_write, 1, :eet_file_mode_read_write, 2 ] # # TYPEDEFS # typedef struct _Eet_Version Eet_Version; diff --git a/lib/efl/native/eina_log.rb b/lib/efl/native/eina_log.rb index 555bfe4..502c5ec 100644 --- a/lib/efl/native/eina_log.rb +++ b/lib/efl/native/eina_log.rb @@ -22,8 +22,8 @@ module Efl # # ENUMS # typedef enum _Eina_Log_Level {...} Eina_Log_Level; - enum :eina_log_level, [ :eina_log_level_critical, :eina_log_level_err, :eina_log_level_warn, :eina_log_level_info, :eina_log_level_dbg, - :eina_log_levels, :eina_log_level_unknown, (-2147483647 - 1) ] + enum :eina_log_level, [ :eina_log_level_critical, 0, :eina_log_level_err, 1, :eina_log_level_warn, 2, :eina_log_level_info, 3, + :eina_log_level_dbg, 4, :eina_log_levels, 5, :eina_log_level_unknown, (-2147483647-1) ] # # TYPEDEFS # typedef struct _Eina_Log_Domain Eina_Log_Domain; diff --git a/lib/efl/native/evas.rb b/lib/efl/native/evas.rb index 6a49864..f55830a 100644 --- a/lib/efl/native/evas.rb +++ b/lib/efl/native/evas.rb @@ -22,8 +22,8 @@ module Efl # # ENUMS # typedef enum _Evas_BiDi_Direction {...} Evas_BiDi_Direction; - enum :evas_bidi_direction, [ :evas_bidi_direction_natural, :evas_bidi_direction_neutral, evas_bidi_direction_natural, - :evas_bidi_direction_ltr, :evas_bidi_direction_rtl ] + enum :evas_bidi_direction, [ :evas_bidi_direction_natural, 0, :evas_bidi_direction_neutral, 0, :evas_bidi_direction_ltr, 1, + :evas_bidi_direction_rtl, 2 ] # typedef enum _Evas_Callback_Type {...} Evas_Callback_Type; enum :evas_callback_type, [ :evas_callback_mouse_in, :evas_callback_mouse_out, :evas_callback_mouse_down, :evas_callback_mouse_up, :evas_callback_mouse_move, :evas_callback_mouse_wheel, :evas_callback_multi_down, :evas_callback_multi_up, :evas_callback_multi_move, @@ -33,9 +33,9 @@ module Efl :evas_callback_render_flush_pre, :evas_callback_render_flush_post, :evas_callback_canvas_object_focus_in, :evas_callback_canvas_object_focus_out, :evas_callback_image_unloaded, :evas_callback_render_pre, :evas_callback_render_post, :evas_callback_last ] # typedef enum _Evas_Button_Flags {...} Evas_Button_Flags; - enum :evas_button_flags, [ :evas_button_none, 0, :evas_button_double_click, (1 << 0), :evas_button_triple_click, (1 << 1) ] + enum :evas_button_flags, [ :evas_button_none, 0, :evas_button_double_click, (1<<0), :evas_button_triple_click, (1<<1) ] # typedef enum _Evas_Event_Flags {...} Evas_Event_Flags; - enum :evas_event_flags, [ :evas_event_flag_none, 0, :evas_event_flag_on_hold, (1 << 0), :evas_event_flag_on_scroll, (1 << 1) ] + enum :evas_event_flags, [ :evas_event_flag_none, 0, :evas_event_flag_on_hold, (1<<0), :evas_event_flag_on_scroll, (1<<1) ] # typedef enum _Evas_Touch_Point_State {...} Evas_Touch_Point_State; enum :evas_touch_point_state, [ :evas_touch_point_down, :evas_touch_point_up, :evas_touch_point_move, :evas_touch_point_still, :evas_touch_point_cancel ] @@ -83,12 +83,13 @@ module Efl enum :evas_object_pointer_mode, [ :evas_object_pointer_mode_autograb, :evas_object_pointer_mode_nograb, :evas_object_pointer_mode_nograb_no_repeat_updown ] # typedef enum _Evas_Text_Style_Type {...} Evas_Text_Style_Type; - enum :evas_text_style_type, [ :evas_text_style_plain, :evas_text_style_shadow, :evas_text_style_outline, :evas_text_style_soft_outline, - :evas_text_style_glow, :evas_text_style_outline_shadow, :evas_text_style_far_shadow, :evas_text_style_outline_soft_shadow, - :evas_text_style_soft_shadow, :evas_text_style_far_soft_shadow, :evas_text_style_shadow_direction_bottom_right, (0x0 << 4), - :evas_text_style_shadow_direction_bottom, (0x1 << 4), :evas_text_style_shadow_direction_bottom_left, (0x2 << 4), - :evas_text_style_shadow_direction_left, (0x3 << 4), :evas_text_style_shadow_direction_top_left, (0x4 << 4), :evas_text_style_shadow_direction_top, - (0x5 << 4), :evas_text_style_shadow_direction_top_right, (0x6 << 4), :evas_text_style_shadow_direction_right, (0x7 << 4) ] + enum :evas_text_style_type, [ :evas_text_style_plain, 0, :evas_text_style_shadow, 1, :evas_text_style_outline, 2, + :evas_text_style_soft_outline, 3, :evas_text_style_glow, 4, :evas_text_style_outline_shadow, 5, :evas_text_style_far_shadow, 6, + :evas_text_style_outline_soft_shadow, 7, :evas_text_style_soft_shadow, 8, :evas_text_style_far_soft_shadow, 9, + :evas_text_style_shadow_direction_bottom_right, (0x0<<4), :evas_text_style_shadow_direction_bottom, (0x1<<4), + :evas_text_style_shadow_direction_bottom_left, (0x2<<4), :evas_text_style_shadow_direction_left, (0x3<<4), :evas_text_style_shadow_direction_top_left, + (0x4<<4), :evas_text_style_shadow_direction_top, (0x5<<4), :evas_text_style_shadow_direction_top_right, (0x6<<4), + :evas_text_style_shadow_direction_right, (0x7<<4) ] # typedef enum _Evas_Textblock_Text_Type {...} Evas_Textblock_Text_Type; enum :evas_textblock_text_type, [ :evas_textblock_text_raw, :evas_textblock_text_plain, :evas_textblock_text_markup ] # typedef enum _Evas_Textblock_Cursor_Type {...} Evas_Textblock_Cursor_Type; diff --git a/spec/evas_spec.rb b/spec/evas_spec.rb index 9d7d6bc..c8c3bff 100644 --- a/spec/evas_spec.rb +++ b/spec/evas_spec.rb @@ -27,6 +27,13 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do Evas.shutdown.should == @init end # + it "evas_bidi_direction should be correct" do + Efl::Native.enum_value(:evas_bidi_direction_natural).should == 0 + Efl::Native.enum_value(:evas_bidi_direction_neutral).should == 0 + Efl::Native.enum_value(:evas_bidi_direction_ltr).should == 1 + Efl::Native.enum_value(:evas_bidi_direction_rtl).should == 2 + end + # it "evas alloc error enum is ok" do Native.enum_value(:evas_alloc_error_none).should == 0 Native.enum_value(:evas_alloc_error_fatal).should == 1 @@ -632,7 +639,7 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do @t.horiz_advance_get.should > 0 @t.vert_advance_get.should > 0 @t.inset_get.should > 0 - @t.direction_get.should == :evas_bidi_direction_neutral + @t.direction_get.should == :evas_bidi_direction_ltr @t.style_pad_get.length.should == 4 @t.ascent.should > 0 @t.descent.should > 0 @@ -641,7 +648,7 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do @t.horiz_advance.should > 0 @t.vert_advance.should > 0 @t.inset.should > 0 - @t.direction.should == :evas_bidi_direction_neutral + @t.direction.should == :evas_bidi_direction_ltr @t.style_pad.length.should == 4 end # @@ -726,7 +733,7 @@ describe "Efl::Evas #{Efl::Evas.version.full}" do end @os.delete_at 2 @b.remove_at(2).should be_true -# @b.remove_at(20).should be_false + @b.remove_at(20).should be_false o = @os.delete_at 2 @b.remove(o).should be_true @b.children_get.each_with_index do |o,i| |