From: sachiel Date: Fri, 29 Jul 2011 19:58:07 +0000 (+0000) Subject: Add preview for window X-Git-Tag: REL_F_I9500_20120323_1~17^2~2093 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=75fd8c85201dd7294c10f20b2011441d7980cca1;p=framework%2Fuifw%2Felementary.git Add preview for window git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@61908 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- diff --git a/doc/Makefile.am b/doc/Makefile.am index ad90c26..c390079 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -73,7 +73,8 @@ WGT_PREVIEW = \ inwin:preview-01.png:widget_preview_inwin2:200:160 \ inwin:preview-02.png:widget_preview_inwin3:200:160 \ scroller:preview-00.png:widget_preview_scroller:100:30 \ - table::preview-00.png:widget_preview_table:100:100 + table::preview-00.png:widget_preview_table:100:100 \ + win:preview-00.png:widget_preview_win:200:200 widget-build: @$(MAKE) -C widgets diff --git a/doc/index.doxy b/doc/index.doxy index cdb562a..4717433 100644 --- a/doc/index.doxy +++ b/doc/index.doxy @@ -197,6 +197,9 @@ * @li @ref Widget * @li @ref Win * + * @image html img/widget/win/preview-00.png + * @image latex img/widget/win/preview-00.eps + * * Elementary is also about displaing its widgets in a nice layout, for this * purpose it provides a number of containers. It's important to note that as * containers these widgets don't have their own visual identity, so here we diff --git a/doc/widgets/Makefile.am b/doc/widgets/Makefile.am index 3f999cb..c95ae27 100644 --- a/doc/widgets/Makefile.am +++ b/doc/widgets/Makefile.am @@ -89,7 +89,8 @@ widget_preview_inwin1 \ widget_preview_inwin2 \ widget_preview_inwin3 \ widget_preview_scroller \ -widget_preview_table +widget_preview_table \ +widget_preview_win LDADD = $(top_builddir)/src/lib/libelementary.la @ELEMENTARY_EWEATHER_LIBS@ @ELEMENTARY_EDBUS_LIBS@ @ELEMENTARY_EFREET_LIBS@ @ELEMENTARY_EMAP_LIBS@ @ELEMENTARY_LIBS@ @EIO_LIBS@ @my_libs@ @@ -160,5 +161,6 @@ EXTRA_DIST = \ widget_preview_inwin3.c \ widget_preview_scroller.c \ widget_preview_table.c \ + widget_preview_win.c \ widget_preview_tmpl_foot.c \ widget_preview_tmpl_head.c diff --git a/doc/widgets/widget_preview_win.c b/doc/widgets/widget_preview_win.c new file mode 100644 index 0000000..ae10c2b --- /dev/null +++ b/doc/widgets/widget_preview_win.c @@ -0,0 +1,8 @@ +#include "widget_preview_tmpl_head.c" + +Evas_Object *o = elm_label_add(win); +elm_object_text_set(o, "Here be window contents"); +elm_win_resize_object_add(win, o); +evas_object_show(o); + +#include "widget_preview_tmpl_foot.c" diff --git a/src/lib/Elementary.h.in b/src/lib/Elementary.h.in index b301846..86e04a1 100644 --- a/src/lib/Elementary.h.in +++ b/src/lib/Elementary.h.in @@ -1599,6 +1599,9 @@ extern "C" { /* win */ /** @defgroup Win Win * + * @image html img/widget/win/preview-00.png + * @image latex img/widget/win/preview-00.eps + * * The window class of Elementary. Contains functions to manipulate * windows. The Evas engine used to render the window contents is specified * in the system or user elementary config files (whichever is found last),