From 914243deb855cb4e6fdc561298e4b3d294e216f6 Mon Sep 17 00:00:00 2001
From: Christopher Michael <cpmichael1@comcast.net>
Date: Fri, 8 Jan 2010 17:54:26 +0000
Subject: [PATCH] Add illume conformant widget and test app.

SVN revision: 44982
---
 legacy/elementary/data/themes/default.edc | 31 +++++++++++++++++++++++
 legacy/elementary/src/bin/Makefile.am     |  3 ++-
 legacy/elementary/src/bin/test.c          |  2 ++
 legacy/elementary/src/lib/Elementary.h.in |  3 +++
 legacy/elementary/src/lib/Makefile.am     |  1 +
 5 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/legacy/elementary/data/themes/default.edc b/legacy/elementary/data/themes/default.edc
index 7f1f3487d7..34eb79c95c 100644
--- a/legacy/elementary/data/themes/default.edc
+++ b/legacy/elementary/data/themes/default.edc
@@ -22168,4 +22168,35 @@ group
      }
 }
 
+///////////////////////////////////////////////////////////////////////////////
+group 
+{
+   name: "elm/conformant/base/default";
+   parts 
+     {
+        part 
+          {
+             name: "elm.swallow.shelf";
+             type: SWALLOW;
+             description 
+               {
+                  state: "default" 0.0;
+                  align: 0.0 0.0;
+               }
+          }
+        part 
+          {
+             name: "elm.swallow.content";
+             type: SWALLOW;
+             description 
+               {
+                  state: "default" 0.0;
+                  align: 0.0 0.0;
+                  rel1.relative: 0.0 1.0;
+                  rel1.to_y: "elm.swallow.shelf";
+               }
+          }
+     }
+}
+
 }
diff --git a/legacy/elementary/src/bin/Makefile.am b/legacy/elementary/src/bin/Makefile.am
index a042db73c4..e8bc55439d 100644
--- a/legacy/elementary/src/bin/Makefile.am
+++ b/legacy/elementary/src/bin/Makefile.am
@@ -69,7 +69,8 @@ test_panel.c \
 test_map.c \
 test_weather.c \
 test_flip.c \
-test_label.c
+test_label.c \
+test_conform.c
 
 elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@
 elementary_test_LDFLAGS =
diff --git a/legacy/elementary/src/bin/test.c b/legacy/elementary/src/bin/test.c
index 54012fdd15..26b4db5951 100644
--- a/legacy/elementary/src/bin/test.c
+++ b/legacy/elementary/src/bin/test.c
@@ -57,6 +57,7 @@ void test_map(void *data, Evas_Object *obj, void *event_info);
 void test_weather(void *data, Evas_Object *obj, void *event_info);
 void test_flip(void *data, Evas_Object *obj, void *event_info);
 void test_label(void *data, Evas_Object *obj, void *event_info);
+void test_conformant(void *data, Evas_Object *obj, void *event_info);
 
 static void
 my_win_del(void *data, Evas_Object *obj, void *event_info)
@@ -196,6 +197,7 @@ my_win_main(void)
    elm_list_item_append(li, "Weather", NULL, NULL, test_weather, NULL);
    elm_list_item_append(li, "Flip", NULL, NULL, test_flip, NULL);
    elm_list_item_append(li, "Label", NULL, NULL, test_label, NULL);
+   elm_list_item_append(li, "Conformant", NULL, NULL, test_conformant, NULL);
 
    elm_list_go(li);
 
diff --git a/legacy/elementary/src/lib/Elementary.h.in b/legacy/elementary/src/lib/Elementary.h.in
index 5c88d23ba6..2fc9e1bacf 100644
--- a/legacy/elementary/src/lib/Elementary.h.in
+++ b/legacy/elementary/src/lib/Elementary.h.in
@@ -1247,6 +1247,9 @@ extern "C" {
    EAPI Eina_Bool    elm_scrolled_entry_context_menu_disabled_get(Evas_Object *obj);
    EAPI void         elm_scrolled_entry_scrollbar_policy_set(Evas_Object *obj, Elm_Scroller_Policy h, Elm_Scroller_Policy v);
 
+   EAPI Evas_Object *elm_conformant_add(Evas_Object *parent);
+   EAPI void         elm_conformant_content_set(Evas_Object *obj, Evas_Object *content);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/legacy/elementary/src/lib/Makefile.am b/legacy/elementary/src/lib/Makefile.am
index ff104aed3d..de7c750a9e 100644
--- a/legacy/elementary/src/lib/Makefile.am
+++ b/legacy/elementary/src/lib/Makefile.am
@@ -68,6 +68,7 @@ elm_menu.c \
 elm_panel.c \
 elm_map.c \
 elm_flip.c \
+elm_conform.c \
 \
 elc_notepad.c \
 elc_anchorview.c \