aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYakov Goldberg <yakov.g@samsung.com>2015-03-19 14:08:23 +0200
committerYakov Goldberg <yakov.g@samsung.com>2015-03-19 19:10:34 +0200
commitce5984e548d4f6e369b9ddaa7d2cb54ba3e91f27 (patch)
tree83169736fdf3c6262ccdd813f3681798c8d632bb
parentElm_toolbar: Sizing evaluation improvement. (diff)
downloadelementary-devs/yakov/file_get_for_layout.tar.gz
Implement efl_file_get() for Elm_Layout and Elm_Videodevs/yakov/file_get_for_layout
"file" property in Efl.File interface is virtual pure, so according to OO principles must be implemented in derived classes. This patch adds implementation of "file.get" in Elm_Layout. Further, Elm_Video class has it's own implementation of "file.set", thus also requires implementation of "file.get"
-rw-r--r--src/lib/elm_layout.c7
-rw-r--r--src/lib/elm_layout.eo1
-rw-r--r--src/lib/elm_video.c6
-rw-r--r--src/lib/elm_video.eo1
4 files changed, 15 insertions, 0 deletions
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index 6e3ccb257..19f6b4719 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -857,6 +857,13 @@ _elm_layout_efl_file_file_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *fi
return int_ret;
}
+EOLIAN static void
+_elm_layout_efl_file_file_get(Eo *obj, Elm_Layout_Smart_Data *sd EINA_UNUSED, const char **file, const char **group)
+{
+ ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
+ edje_object_file_get(wd->resize_obj, file, group);
+}
+
EOLIAN static Eina_Bool
_elm_layout_theme_set(Eo *obj, Elm_Layout_Smart_Data *sd, const char *klass, const char *group, const char *style)
{
diff --git a/src/lib/elm_layout.eo b/src/lib/elm_layout.eo
index f606a5552..7dca64677 100644
--- a/src/lib/elm_layout.eo
+++ b/src/lib/elm_layout.eo
@@ -628,6 +628,7 @@ class Elm_Layout (Elm_Container, Efl.File)
Eo.Base.constructor;
Eo.Base.dbg_info_get;
Efl.File.file.set;
+ Efl.File.file.get;
Evas.Object_Smart.del;
Evas.Object_Smart.add;
Evas.Object_Smart.calculate;
diff --git a/src/lib/elm_video.c b/src/lib/elm_video.c
index 3db858fcd..c36f74e49 100644
--- a/src/lib/elm_video.c
+++ b/src/lib/elm_video.c
@@ -299,6 +299,12 @@ _elm_video_efl_file_file_set(Eo *obj, Elm_Video_Data *sd, const char *filename,
return EINA_TRUE;
}
+EOLIAN static void
+_elm_video_efl_file_file_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd EINA_UNUSED, const char **filename, const char **key EINA_UNUSED)
+{
+ *filename = emotion_object_file_get(sd->emotion);
+}
+
EOLIAN static Evas_Object*
_elm_video_emotion_get(Eo *obj EINA_UNUSED, Elm_Video_Data *sd)
{
diff --git a/src/lib/elm_video.eo b/src/lib/elm_video.eo
index 3ff579762..56d58d72f 100644
--- a/src/lib/elm_video.eo
+++ b/src/lib/elm_video.eo
@@ -181,6 +181,7 @@ class Elm_Video (Elm_Layout, Efl.File, Elm_Interface_Atspi_Widget_Action)
class.constructor;
Eo.Base.constructor;
Efl.File.file.set;
+ Efl.File.file.get;
Evas.Object_Smart.add;
Evas.Object_Smart.del;
Elm_Widget.focus_next_manager_is;