vtorri
/
terminology
forked from enlightenment/terminology
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make terminology compile with efl 1.7

This commit is contained in:
Boris Faure 2014-09-23 21:54:41 +02:00
parent fcd67ce7a2
commit 9538380861
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/options_font.c
View File

@ -379,7 +379,9 @@ options_font(Evas_Object *opbox, Evas_Object *term)
elm_slider_unit_format_set(o, "%1.0f");
elm_slider_indicator_format_set(o, "%1.0f");
elm_slider_min_max_set(o, FONT_MIN, FONT_MAX);
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
elm_slider_step_set(o, FONT_STEP);
#endif
elm_slider_value_set(o, config->font.size);
elm_box_pack_end(bx, o);
evas_object_show(o);

13
src/bin/options_keys.c
View File

@ -137,13 +137,26 @@ _hover_sizing_eval(void)
{
Evas_Coord x = 0, y = 0, w = 0, h = 0, min_w, min_h, new_x, new_y;
evas_object_geometry_get(_fr, &x, &y, &w, &h);
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
evas_object_geometry_set(_rect, x, y, w, h);
#else
evas_object_move(_rect, x, y);
evas_object_resize(_rect, w, h);
#endif
evas_object_size_hint_min_get(_lbl, &min_w, &min_h);
new_x = x + w/2 - min_w/2;
new_y = y + h/2 - min_h/2;
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
evas_object_geometry_set(_lbl, new_x, new_y, min_w, min_h);
evas_object_geometry_set(_bg, new_x - 1, new_y - 1, min_w + 2, min_h + 2);
#else
evas_object_move(_lbl, new_x, new_y);
evas_object_resize(_lbl, min_w, min_h);
evas_object_move(_bg, new_x - 1, new_y - 1);
evas_object_resize(_bg, min_w + 2, min_h + 2);
#endif
}
static void
_parent_move_cb(void *data EINA_UNUSED,
Evas *e EINA_UNUSED,

2
src/bin/tycat.c
View File

@ -316,7 +316,9 @@ main(int argc, char **argv)
}
eina_init();
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
ecore_app_no_system_modules();
#endif
ecore_init();
ecore_file_init();
evas_init();

2
src/bin/tyls.c
View File

@ -756,7 +756,9 @@ main(int argc, char **argv)
return 0;
}
eina_init();
#if (ECORE_VERSION_MAJOR > 1) || (ECORE_VERSION_MINOR >= 8)
ecore_app_no_system_modules();
#endif
ecore_init();
ecore_file_init();
evas_init();