aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2014-09-23 21:54:41 +0200
committerBoris Faure <billiob@gmail.com>2014-09-23 21:54:41 +0200
commit95383808612fd21be6deffddff552182ab447e57 (patch)
treebdb606dac896a551f6b4e6098884db0cb5290365 /src
parentoptions: chagne step of font size slider from 2 to 1 (diff)
downloadterminology-95383808612fd21be6deffddff552182ab447e57.tar.gz
make terminology compile with efl 1.7
Diffstat (limited to 'src')
-rw-r--r--src/bin/options_font.c2
-rw-r--r--src/bin/options_keys.c13
-rw-r--r--src/bin/tycat.c2
-rw-r--r--src/bin/tyls.c2
4 files changed, 19 insertions, 0 deletions
diff --git a/src/bin/options_font.c b/src/bin/options_font.c
index f30cae8..4580d61 100644
--- a/src/bin/options_font.c
+++ b/src/bin/options_font.c
@@ -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);
diff --git a/src/bin/options_keys.c b/src/bin/options_keys.c
index 7cee17a..c0f68e0 100644
--- a/src/bin/options_keys.c
+++ b/src/bin/options_keys.c
@@ -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,
diff --git a/src/bin/tycat.c b/src/bin/tycat.c
index 0e25aa6..f460efa 100644
--- a/src/bin/tycat.c
+++ b/src/bin/tycat.c
@@ -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();
diff --git a/src/bin/tyls.c b/src/bin/tyls.c
index 05c53f5..c8067c7 100644
--- a/src/bin/tyls.c
+++ b/src/bin/tyls.c
@@ -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();