forked from enlightenment/efl
Merge branch 'master' into devs/hermet/lottie
This commit is contained in:
Hermet Park
commit
421836c116
68
.mailmap
68
.mailmap
|
|
@ -16,9 +16,11 @@ Cedric BAIL <cedric.bail@free.fr> Cedric BAIL <cedric@osg.samsung.com>
|
|||
Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vtorri@univ-evry.fr>
|
||||
Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vincent dot torri at gmail dot com>
|
||||
Vincent Torri <vincent.torri@gmail.com> Vincent Torri <vincent.torri@univ-evry.fr>
|
||||
Vincent Torri <vincent.torri@gmail.com> Vincent 'vtorri' Torri <vincent.torri@gmail.com>
|
||||
Tom Hacohen <tom@stosb.com> Tom 'TAsn' Hacohen <tom@stosb.com>
|
||||
Tom Hacohen <tom@stosb.com> Tom <tom@stosb.com>
|
||||
Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <barbieri@profusion.mobi>
|
||||
Gustavo Sverzut Barbieri <barbieri@gmail.com> Gustavo Sverzut Barbieri <gustavo.barbieri@intel.com>
|
||||
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@comcast.net>
|
||||
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cp.michael@samsung.com>
|
||||
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael1@comcast.net>
|
||||
|
|
@ -28,6 +30,7 @@ Christopher Michael <devilhorns@comcast.net> Christopher <devilhorns@comcast.net
|
|||
Christopher Michael <devilhorns@comcast.net> Chris Michael <cp.michael@samsung.com>
|
||||
Christopher Michael <devilhorns@comcast.net> Christopher Michael <cpmichael@osg.samsung.com>
|
||||
Christopher Michael <devilhorns@comcast.net> Chris Michael <cpmichael@osg.samsung.com>
|
||||
Christopher Michael <devilhorns@comcast.net> Chris Micheal <cp.michael@samsung.com>
|
||||
Sebastian Dransfeld <sd@tango.flipp.net> Sebastian Dransfeld <sebastian.dransfeld@sintef.no>
|
||||
Sebastian Dransfeld <sd@tango.flipp.net> sebastid <sebastid>
|
||||
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <m.blumenkran@samsung.com>
|
||||
|
|
@ -35,13 +38,21 @@ Mike Blumenkrantz <michael.blumenkrantz@gmail.com> discomfitor <michael.blumenkr
|
|||
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> zmike <michael.blumenkrantz@gmail.com>
|
||||
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@samsung.com>
|
||||
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@osg.samsung.com>
|
||||
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Michael Blumenkrantz <mike@zentific.com>
|
||||
Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Mike Blumenkrantz <zmike@enlightenment.org>
|
||||
ChunEon Park <hermet@hermet.pe.kr> ChunEon Park <chuneon.park@samsung.com>
|
||||
ChunEon Park <hermet@hermet.pe.kr> Hermet Park <hermet@hermet.pe.kr>
|
||||
ChunEon Park <hermet@hermet.pe.kr> Hermet Park <hermetpark@gmail.com>
|
||||
ChunEon Park <hermet@hermet.pe.kr> hermet <hermet@neoni.(none)>
|
||||
ChunEon Park <hermet@hermet.pe.kr> Hermet <hermet@hermet.pe.kr>
|
||||
ChunEon Park <hermet@hermet.pe.kr> chuneon.park <chuneon.park@samsung.com>
|
||||
David Walter Seikel <onefang@gmail.com> David Walter Seikel <won_fang@yahoo.com.au>
|
||||
Rafael Antognolli <antognolli@gmail.com> Rafael Antognolli <rafael.antognolli@intel.com>
|
||||
Rafael Antognolli <antognolli@gmail.com> Rafael Antognolli <rafael.antognolli@linux.intel.com>
|
||||
Iván Briano <sachieru@gmail.com> Ivan Briano <ivan.briano@intel.com>
|
||||
Iván Briano <sachieru@gmail.com> Ivan Briano <sachieru@gmail.com>
|
||||
Iván Briano <sachieru@gmail.com> Iván Briano <ivan.briano@intel.com>
|
||||
Iván Briano <sachieru@gmail.com> Ivan Briano <ivan@profusion.mobi>
|
||||
Lucas De Marchi <lucas.demarchi@profusion.mobi> Lucas De Marchi <lucas.de.marchi@gmail.com>
|
||||
Lucas De Marchi <lucas.demarchi@profusion.mobi> Lucas De Marchi <lucas.demarchi@intel.com>
|
||||
Jihoon Kim <imfine98@gmail.com> Jihoon Kim <jihoon48.kim@samsung.com>
|
||||
|
|
@ -60,21 +71,29 @@ Mike McCormack <mike@atratus.org> Mike McCormack <mj.mccormack@samsung.com>
|
|||
Mike McCormack <mike@atratus.org> Mike McCormack <mikem@ring3k.org>
|
||||
Mike McCormack <mike@atratus.org> Mike McCormack <mikem@atratus.org>
|
||||
Boris Faure <billiob@gmail.com> Boris 'billiob' Faure <billiob@gmail.com>
|
||||
Boris Faure <billiob@gmail.com> Boris Faure <boris@fau.re>
|
||||
Eduardo Lima <eduardo.lima@intel.com> Eduardo Lima (Etrunko) <eduardo.lima@intel.com>
|
||||
Panagiotis Galatsanos <galatsanosp@gmail.com> Godfath3r <galatsanosp@gmail.com>
|
||||
Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis@gmail.com>
|
||||
Samuel F. Baggen <thanatermesis@gmail.com> Samuel F. Baggen <thanatermesis.elive@gmail.com>
|
||||
Samuel F. Baggen <thanatermesis@gmail.com> Thanatermesis <thanatermesis.ecvs@gmail.com>
|
||||
Jean Guyomarc'h <jean.guyomarch@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com>
|
||||
Marcel Hollerbach <marcel-hollerbach@t-online.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de>
|
||||
Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean.guyomarch@gmail.com>
|
||||
Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean GUYOMARC'H <jean.guyomarch@gmail.com>
|
||||
Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean.guyomarch@openwide.fr>
|
||||
Jean Guyomarc'h <jeanguyomarch.github@gmail.com> Jean Guyomarc'h <jean@guyomarch.bzh>
|
||||
Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel.hollerbach@stzedn.de>
|
||||
Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel-hollerbach@t-online.de>
|
||||
Marcel Hollerbach <mail@marcel-hollerbach.de> Marcel Hollerbach <marcel@osg.samsung.com>
|
||||
Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jp.andre@samsung.com>
|
||||
Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe ANDRE <jpeg@videolan.org>
|
||||
Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe Andre <jpeg@videolan.org>
|
||||
Jean-Philippe ANDRÉ <jpeg@videolan.org> Jean-Philippe André <jpeg@videolan.org>
|
||||
Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <amitesh.sh@samsung.com>
|
||||
Amitesh Singh <amitesh.sh@samsung.com> ami <singh.amitesh@gmail.com>
|
||||
Amitesh Singh <amitesh.sh@samsung.com> Amitesh Singh <singh.amitesh@gmail.com>
|
||||
Tae-Hwan Kim <the81.kim@samsung.com> bluezery <ohpowel@gmail.com>
|
||||
Tae-Hwan Kim <the81.kim@samsung.com> Bluezery <ohpowel@gmail.com>
|
||||
Tae-Hwan Kim <the81.kim@samsung.com> bluezery <the81.kim@samsung.com>
|
||||
Daniel Kolesa <daniel@octaforge.org> q66 <quaker66@gmail.com>
|
||||
Daniel Kolesa <daniel@octaforge.org> q66 <d.kolesa@samsung.com>
|
||||
Daniel Kolesa <daniel@octaforge.org> q66 <d.kolesa@osg.samsung.com>
|
||||
|
|
@ -91,7 +110,52 @@ Daniel Zaoui <daniel.zaoui@samsung.com> Daniel Zaoui <daniel.zaoui@yahoo.com>
|
|||
Daniel Zaoui <daniel.zaoui@samsung.com> daniel.zaoui@samsung.com <daniel.zaoui@samsung.com>
|
||||
Jérémy Anger <angerj.dev@gmail.com> kidanger <angerj.dev@gmail.com>
|
||||
Andy Williams <andy@andywilliams.me> handyande <handyande>
|
||||
Andy Williams <andy@andywilliams.me> Andy Williams <andy@andywillias.me>
|
||||
Davide Andreoli <dave@gurumeditation.it> Dave Andreoli <dave@gurumeditation.it>
|
||||
Davide Andreoli <dave@gurumeditation.it> davemds <dave@gurumeditation.it>
|
||||
Simon Lees <simon@simotek.net> Simon <simon@simotek.net>
|
||||
Simon Lees <simon@simotek.net> Simon Lees (SUSE) <sflees@suse.de>
|
||||
Subhransu Mohanty <sub.mohanty@samsung.com> SubhransuSekhar Mohanty <sub.mohanty@samsung.com>
|
||||
Subhransu Mohanty <sub.mohanty@samsung.com> Subhransu Sekhar Mohanty <sub.mohanty@samsung.com>
|
||||
Subhransu Mohanty <sub.mohanty@samsung.com> SubhransuSekhar Mohanty <sub.mohanty@samsung.com>
|
||||
Subhransu Mohanty <sub.mohanty@samsung.com> sub.mohanty@samsung.com <sub.mohanty@samsung.com>
|
||||
Subhransu Mohanty <sub.mohanty@samsung.com> subhransu <subhransu@subhransu-System.(none)>
|
||||
Subhransu Mohanty <sub.mohanty@samsung.com> subhransu mohanty <sub.mohanty@samsung.com>
|
||||
Thiep Ha <thiepha@gmail.com> Thiep Ha <thiep.ha@samsung.com>
|
||||
Thiep Ha <thiepha@gmail.com> Thiep Ha <thiep.ha@gmail.com>
|
||||
Thiep Ha <thiepha@gmail.com> thiepha (Thiep Ha) <thiepha@gmail.com>
|
||||
Derek Foreman <derekf@osg.samsung.com> Derek Foreman <derek.foreman.samsung@gmail.com>
|
||||
Daniel Hirt <hirt.danny@gmail.com> Daniel Hirt <daniel.hirt@samsung.com>
|
||||
Jiyoun Park <jijibe99@gmail.com> Ji-Youn Park <jy0703.park@samsung.com>
|
||||
Jiyoun Park <jijibe99@gmail.com> Jiyoun Park <jy0703.park@samsung.com>
|
||||
Bruno da Silva Belo <brunodasilvabelo@gmail.com> Bruno da Silva Belo <bruno.belo@expertisesolutions.com.br>
|
||||
Rafael Fonseca <rfonseca@profusion.mobi> Rafael Fonseca <r4f4rfs@gmail.com>
|
||||
Lauro Moura <lauromoura@expertisesolutions.com.br> Lauro Moura <lauromoura@gmail.com>
|
||||
Jaehyun Cho <jae_hyun.cho@samsung.com> Jaehyun Cho <jae_hyun_cho@naver.com>
|
||||
Jérémy Zurcher <jeremy@asynk.ch> Jeremy Zurcher <jeremy@asynk.ch>
|
||||
Youngbok Shin <youngb.shin@samsung.com> Youngbok Shin <youngb.shin@samsung.net>
|
||||
Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen okra Houston <smhouston88@gmail.com>
|
||||
Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <smhouston88@gmail.com>
|
||||
Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@localhost.localdomain>
|
||||
Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@lenovo.fedora>
|
||||
Stephen 'Okra' Houston <smhouston88@gmail.com> Stephen Houston <stephen@stephen.laptop>
|
||||
WooHyun Jung <wh0705.jung@samsung.com> WooHyun Jung <woohyun0705@gmail.com>
|
||||
Jaeun Choi <jaeun12.choi@samsung.com> Jaeun Choi <jaeun_choi@naver.com>
|
||||
Michael BOUCHAUD <michael.bouchaud@gmail.com> Michael Bouchaud (yoz) <yoz@efl.so>
|
||||
Michael BOUCHAUD <michael.bouchaud@gmail.com> Michael Bouchaud <yoz@efl.so>
|
||||
Michael BOUCHAUD <michael.bouchaud@gmail.com> michael bouchaud <michael.bouchaud@gmail.com>
|
||||
Michael Jennings <mej@kainx.org> Michael Jennings <mej@lbl.gov>
|
||||
Taehyub Kim <taehyub.kim@samsung.com> taehyub <taehyub.kim@samsung.com>
|
||||
Yury Usishchev <y.usishchev@samsung.com> Yury Usischev <y.usishchev@samsung.com>
|
||||
Lukasz Stanislawski <l.stanislaws@samsung.com> Lukasz Stanislawski <l.stanislaws@AMDC2785.digital.local>
|
||||
Lukasz Stanislawski <l.stanislaws@samsung.com> Lukasz Stanislawski <lukasz.stanislawski@gmail.com>
|
||||
Ryuan Choi <ryuan.choi@gmail.com> Ryuan Choi <ryuan.choi@samsung.com>
|
||||
Bryce Harrington <bryce@osg.samsung.com> Bryce Harrington <bryce@bryceharrington.org>
|
||||
Jonathan Atton <jonathan.atton@gmail.com> Atton Jonathan <jonathan.atton@gmail.com>
|
||||
Yeongjong Lee <yj34.lee@samsung.com> YeongJong Lee <yj34.lee@samsung.com>
|
||||
Jaehwan Kim <jae.hwan.kim@samsung.com> Jaehwan Kim <jae.hwan.kim.neo@gmail.com>
|
||||
Jaehwan Kim <jae.hwan.kim@samsung.com> Jae Hwan Kim <jae.hwan.kim@samsung.com>
|
||||
Jaehwan Kim <jae.hwan.kim@samsung.com> 김재환 <jae.hwan.kim@samsung.com>
|
||||
Jee-Yong Um <jc9.um@samsung.com> Jeeyong Um <jc9.um@samsung.com>
|
||||
Savio Sena <savio@expertisesolutions.com.br> Savio S. Machado <savio.sena@acm.org>
|
||||
Savio Sena <savio@expertisesolutions.com.br> Savio Sena <savio.sena@acm.org>
|
||||
|
|
|
|||
|
|
@ -813,12 +813,9 @@
|
|||
*
|
||||
* This example will start a server and start accepting connections from clients, as
|
||||
* demonstrated in the following diagram:
|
||||
* @htmlonly
|
||||
* <img src="ecore_con-client-server-example.png" style="max-width: 400px"/>
|
||||
* <a href="ecore_con-client-server-example.png">Full size</a>
|
||||
* @endhtmlonly
|
||||
*
|
||||
* @image rtf ecore_con-client-server-example.png
|
||||
* @image html ecore_con-client-server-example.png
|
||||
* @image latex ecore_con-client-server-example.eps width=\textwidth
|
||||
*
|
||||
* @note This example contains a serious security flaw: it doesn't check for the
|
||||
|
|
@ -877,12 +874,9 @@
|
|||
*
|
||||
* This example will connect to the server and start comunicating with it, as
|
||||
* demonstrated in the following diagram:
|
||||
* @htmlonly
|
||||
* <img src="ecore_con-client-server-example2.png" style="max-width: 400px"/>
|
||||
* <a href="ecore_con-client-server-example2.png">Full size</a>
|
||||
* @endhtmlonly
|
||||
*
|
||||
* @image rtf ecore_con-client-server-example2.png
|
||||
* @image html ecore_con-client-server-example2.png
|
||||
* @image latex ecore_con-client-server-example2.eps width=\textwidth
|
||||
*
|
||||
* @note This example contains a serious security flaw: it doesn't check for the
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
cp $@
|
||||
|
|
@ -104,8 +104,6 @@ widget_preview_eps = custom_target('widget_preview_prefs_epc',
|
|||
|
||||
shot_sh = find_program('shot.sh')
|
||||
tar = find_program('tar')
|
||||
efl_copy = find_program('efl_copy.sh')
|
||||
|
||||
foreach text_filter_property : text_filter_properties
|
||||
text = text_filter_property[0]
|
||||
font = text_filter_property[1]
|
||||
|
|
@ -182,17 +180,10 @@ doc_target += custom_target('doxygen',
|
|||
build_by_default: false
|
||||
)
|
||||
|
||||
# This is not pretty but meson does not seem to allow wildcards in plain cp commands
|
||||
copy_images = custom_target('documentation images',
|
||||
command: [efl_copy, '-rf', join_paths(meson.current_source_dir(), 'img', '*.png'), 'html'],
|
||||
output: ['empty_img_copy'],
|
||||
build_by_default: false
|
||||
)
|
||||
|
||||
compress_target = custom_target('package_doc_tar',
|
||||
command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'],
|
||||
output: 'efl-'+meson.project_version()+'-doc.tar.xz',
|
||||
depends: [doc_target, copy_images],
|
||||
depends: [doc_target],
|
||||
build_by_default: false
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -937,9 +937,9 @@ add_tests:
|
|||
ADD_TEST(NULL, "Entries", "Entry Anchor2", test_entry_anchor2);
|
||||
ADD_TEST(NULL, "Entries", "Entry Emoticon", test_entry_emoticon);
|
||||
ADD_TEST(NULL, "Entries", "Entry Password", test_entry_password);
|
||||
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text", test_efl_ui_text);
|
||||
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text Input Field", test_efl_ui_text_inputfield);
|
||||
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text Label", test_efl_ui_text_label);
|
||||
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox", test_efl_ui_text);
|
||||
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox Input Field", test_efl_ui_text_inputfield);
|
||||
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox Label", test_efl_ui_text_label);
|
||||
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Tags", test_ui_tags);
|
||||
|
||||
//------------------------------//
|
||||
|
|
|
|||
|
|
@ -258,7 +258,7 @@ void values_input(Eo* box, const char* type)
|
|||
char color_text[4][2] = { "R", "G", "B", "A" };
|
||||
for (int i = 0; i < 4; i++)
|
||||
{
|
||||
values[i] = efl_add(EFL_UI_TEXT_CLASS, box,
|
||||
values[i] = efl_add(EFL_UI_TEXTBOX_CLASS, box,
|
||||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
|
||||
|
|
@ -270,7 +270,7 @@ void values_input(Eo* box, const char* type)
|
|||
}
|
||||
else if (!strcmp(type, "StrokeWidth"))
|
||||
{
|
||||
values[0] = efl_add(EFL_UI_TEXT_CLASS, box,
|
||||
values[0] = efl_add(EFL_UI_TEXTBOX_CLASS, box,
|
||||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
|
||||
|
|
@ -310,7 +310,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
|
|||
efl_content_set(win, efl_added));
|
||||
|
||||
//Create a label to show state of animation
|
||||
label = efl_add(EFL_UI_TEXT_CLASS, win,
|
||||
label = efl_add(EFL_UI_TEXTBOX_CLASS, win,
|
||||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_pack(box, efl_added));
|
||||
|
|
@ -329,7 +329,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
|
|||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
|
||||
efl_pack(box, efl_added));
|
||||
//Path
|
||||
efl_add(EFL_UI_TEXT_CLASS, box_sub,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
|
||||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
|
||||
efl_text_set(efl_added, "Path examples : three_box.json\n"
|
||||
|
|
@ -346,7 +346,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
|
|||
efl_text_multiline_set(efl_added, EINA_TRUE),
|
||||
efl_pack(box_sub, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, box_sub,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
|
||||
efl_gfx_hint_weight_set(efl_added, 0, 0),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
|
||||
efl_text_set(efl_added, "[Value Provider]"),
|
||||
|
|
@ -361,7 +361,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
|
|||
efl_pack(box, efl_added));
|
||||
|
||||
//Path
|
||||
efl_add(EFL_UI_TEXT_CLASS, box_sub,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
|
||||
efl_gfx_hint_weight_set(efl_added, 0, 0),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
|
||||
|
|
@ -369,7 +369,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
|
|||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(box_sub, efl_added));
|
||||
|
||||
path_entry = efl_add(EFL_UI_TEXT_CLASS, box_sub,
|
||||
path_entry = efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
|
||||
efl_gfx_hint_weight_set(efl_added, 0.1, 0),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
|
||||
|
|
@ -378,7 +378,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
|
|||
efl_gfx_hint_size_min_set(path_entry, EINA_SIZE2D(200, 10));
|
||||
efl_text_set(efl_part(path_entry, "efl.text_guide"), "Enter path(ex: ** or Layer.Shape.Fill) ");
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, box_sub,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
|
||||
efl_gfx_hint_weight_set(efl_added, 0, 0),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
|
||||
|
|
@ -398,7 +398,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
|
|||
elm_object_focus_set(type_hoversel, EINA_TRUE);
|
||||
efl_pack(box_sub, type_hoversel);
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, box_sub,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
|
||||
efl_gfx_hint_weight_set(efl_added, 0, 0),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
|
||||
|
|
@ -479,7 +479,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
|
|||
|
||||
//Duration Text
|
||||
snprintf(buf, sizeof(buf), "Duration: %1.2fs", efl_ui_animation_view_duration_time_get(anim_view));
|
||||
efl_add(EFL_UI_TEXT_CLASS, box_sub,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
|
||||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
|
||||
|
|
@ -583,7 +583,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
|
|||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND),
|
||||
efl_content_set(win, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, win,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, win,
|
||||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_text_set(efl_added, "Evas Vg Json (Lottie) Loader is not supported, Only Static Vector Image is available!"),
|
||||
|
|
|
|||
|
|
@ -151,7 +151,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
|
|||
efl_content_set(win, efl_added));
|
||||
|
||||
//Create a label to show state of animation
|
||||
label = efl_add(EFL_UI_TEXT_CLASS, win,
|
||||
label = efl_add(EFL_UI_TEXTBOX_CLASS, win,
|
||||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_pack(box, efl_added));
|
||||
|
|
@ -201,7 +201,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
|
|||
|
||||
//Duration Text
|
||||
snprintf(buf, sizeof(buf), "Duration: %1.2fs", efl_ui_animation_view_duration_time_get(anim_view));
|
||||
efl_add(EFL_UI_TEXT_CLASS, box2,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, box2,
|
||||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
|
||||
|
|
@ -304,7 +304,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
|
|||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND),
|
||||
efl_content_set(win, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, win,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, win,
|
||||
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
|
||||
efl_text_set(efl_added, "Evas Vg Json (Lottie) Loader is not supported, Only Static Vector Image is available!"),
|
||||
|
|
|
|||
|
|
@ -11,8 +11,8 @@ _apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style)
|
|||
{
|
||||
Efl_Text_Cursor *start, *end;
|
||||
|
||||
start = efl_ui_text_cursor_create(obj);
|
||||
end = efl_ui_text_cursor_create(obj);
|
||||
start = efl_ui_textbox_cursor_create(obj);
|
||||
end = efl_ui_textbox_cursor_create(obj);
|
||||
|
||||
efl_text_cursor_position_set(start, start_pos);
|
||||
efl_text_cursor_position_set(end, end_pos);
|
||||
|
|
@ -27,8 +27,8 @@ static Eo *
|
|||
_create_label(Eo *win, Eo *bx)
|
||||
{
|
||||
Eo *en;
|
||||
en = efl_add(EFL_UI_TEXT_CLASS, win);
|
||||
printf("Added Efl.Ui.Text object\n");
|
||||
en = efl_add(EFL_UI_TEXTBOX_CLASS, win);
|
||||
printf("Added Efl.Ui.Textbox object\n");
|
||||
efl_text_interactive_editable_set(en, EINA_FALSE);
|
||||
efl_pack(bx, en);
|
||||
return en;
|
||||
|
|
@ -156,13 +156,13 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
|
|||
efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
|
||||
efl_content_set(win, bx);
|
||||
|
||||
en = efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
en = efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_multiline_set(efl_added, EINA_TRUE));
|
||||
|
||||
printf("Added Efl.Ui.Text object\n");
|
||||
printf("Added Efl.Ui.Textbox object\n");
|
||||
|
||||
efl_text_interactive_editable_set(en, EINA_TRUE);
|
||||
efl_ui_text_scrollable_set(en, EINA_TRUE);
|
||||
efl_ui_textbox_scrollable_set(en, EINA_TRUE);
|
||||
|
||||
efl_text_font_family_set(en, "Sans");
|
||||
efl_text_font_size_set(en, 12);
|
||||
|
|
@ -215,13 +215,13 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
|
|||
efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
|
||||
efl_content_set(win, bx);
|
||||
|
||||
en = efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
en = efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_multiline_set(efl_added, EINA_FALSE));
|
||||
|
||||
efl_text_interactive_editable_set(en, EINA_TRUE);
|
||||
efl_ui_text_scrollable_set(en, EINA_TRUE);
|
||||
efl_ui_textbox_scrollable_set(en, EINA_TRUE);
|
||||
|
||||
printf("Added Efl.Ui.Text object\n");
|
||||
printf("Added Efl.Ui.Textbox object\n");
|
||||
efl_text_font_width_set(en, EFL_TEXT_FONT_WIDTH_ULTRACONDENSED);
|
||||
efl_text_set(efl_part(en, "efl.text_guide"), "Enter you name here");
|
||||
|
||||
|
|
@ -233,7 +233,7 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
|
|||
efl_text_interactive_editable_set(en, EINA_TRUE);
|
||||
efl_text_wrap_set(en, EFL_TEXT_FORMAT_WRAP_WORD);
|
||||
efl_text_multiline_set(en, EINA_TRUE);
|
||||
efl_ui_text_scrollable_set(en, EINA_TRUE);
|
||||
efl_ui_textbox_scrollable_set(en, EINA_TRUE);
|
||||
evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.5);
|
||||
efl_pack(bx, en);
|
||||
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
#include <Elementary.h>
|
||||
#include <Efl_Ui.h>
|
||||
#include "elm_spinner_eo.h"
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
|
||||
static const int default_font_size = 48;
|
||||
|
||||
typedef struct _Filter_Image
|
||||
|
|
@ -349,8 +349,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
|
|||
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE));
|
||||
efl_pack(box, box2);
|
||||
|
||||
/* FIXME: Efl.Ui.Text doesn't work as expected. */
|
||||
o = efl_add(EFL_UI_TEXT_CLASS, win,
|
||||
/* FIXME: Efl.Ui.Textbox doesn't work as expected. */
|
||||
o = efl_add(EFL_UI_TEXTBOX_CLASS, win,
|
||||
efl_gfx_hint_weight_set(efl_added, 0.0, 1.0),
|
||||
efl_gfx_hint_align_set(efl_added, 1.0, 0.5));
|
||||
efl_text_set(o, "Filter:");
|
||||
|
|
@ -514,8 +514,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
|
|||
"blur { 3, ox = 1, oy = 1, color = 'black' }"
|
||||
"blend { color = 'lime' }";
|
||||
|
||||
o = code = efl_add(EFL_UI_TEXT_CLASS, win,
|
||||
efl_ui_text_scrollable_set(efl_added, EINA_TRUE),
|
||||
o = code = efl_add(EFL_UI_TEXTBOX_CLASS, win,
|
||||
efl_ui_textbox_scrollable_set(efl_added, EINA_TRUE),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_TRUE),
|
||||
efl_text_multiline_set(efl_added, EINA_TRUE));
|
||||
efl_event_callback_add(o, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, _code_changed_hack, win);
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#endif
|
||||
#include <Efl_Ui.h>
|
||||
#include <Elementary.h>
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
|
||||
#define MAX_NUM_OF_CONTENT 17
|
||||
|
||||
const Efl_Class *content_class[MAX_NUM_OF_CONTENT];
|
||||
|
|
@ -80,7 +80,7 @@ _create_box_contents(Evas_Object *box)
|
|||
efl_pack_end(hbox, efl_added));
|
||||
evas_object_data_set(radio, "data", content);
|
||||
|
||||
content = efl_add(EFL_UI_TEXT_CLASS, content,
|
||||
content = efl_add(EFL_UI_TEXTBOX_CLASS, content,
|
||||
efl_text_set(efl_added, "box"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack_end(content, efl_added));
|
||||
|
|
@ -136,7 +136,7 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
|
|||
content_class[5] = EFL_UI_BUTTON_CLASS;
|
||||
content_class[6] = EFL_UI_CHECK_CLASS;
|
||||
content_class[7] = EFL_UI_RADIO_CLASS;
|
||||
content_class[8] = EFL_UI_TEXT_CLASS;
|
||||
content_class[8] = EFL_UI_TEXTBOX_CLASS;
|
||||
content_class[9] = EFL_UI_FLIP_CLASS;
|
||||
content_class[10] = EFL_UI_PANES_CLASS;
|
||||
content_class[11] = EFL_UI_VIDEO_CLASS;
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#endif
|
||||
#include <Efl_Ui.h>
|
||||
#include <Elementary.h>
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
|
||||
static const struct {
|
||||
Evas_Image_Orient orient;
|
||||
const char *name;
|
||||
|
|
@ -813,7 +813,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
|
|||
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
|
||||
efl_content_set(win, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Clicking the image will play/pause animation."),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_gfx_hint_weight_set(efl_added, 1, 0),
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#endif
|
||||
#include <Efl_Ui.h>
|
||||
#include <Elementary.h>
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
|
||||
/* A simple test, just displaying clock in its default format */
|
||||
|
||||
Evas_Object *dt1, *dt2, *dt3, *dt4;
|
||||
|
|
@ -84,7 +84,7 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
|
|||
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Editable Clock:"),
|
||||
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
|
||||
efl_gfx_hint_align_set(efl_added, 0, 0.5),
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#endif
|
||||
#include <Efl_Ui.h>
|
||||
#include <Elementary.h>
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
|
||||
static void
|
||||
_inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
|
||||
{
|
||||
|
|
@ -28,7 +28,7 @@ test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
|
|||
efl_ui_frame_autocollapse_set(efl_added, EINA_FALSE));
|
||||
efl_text_set(f, "Test 1");
|
||||
|
||||
txt = efl_add(EFL_UI_TEXT_CLASS, f);
|
||||
txt = efl_add(EFL_UI_TEXTBOX_CLASS, f);
|
||||
efl_text_set(txt, "Not collapseable");
|
||||
efl_content_set(f, txt);
|
||||
|
||||
|
|
@ -37,7 +37,7 @@ test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
|
|||
efl_ui_frame_autocollapse_set(efl_added, EINA_TRUE));
|
||||
efl_text_set(f, "Test2");
|
||||
|
||||
txt = efl_add(EFL_UI_TEXT_CLASS, f);
|
||||
txt = efl_add(EFL_UI_TEXTBOX_CLASS, f);
|
||||
efl_text_set(txt, "Collapseable");
|
||||
efl_content_set(f, txt);
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#endif
|
||||
#include <Elementary.h>
|
||||
#include <Efl_Ui.h>
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
|
||||
static const struct {
|
||||
Efl_Gfx_Image_Orientation orient;
|
||||
const char *name;
|
||||
|
|
@ -302,7 +302,7 @@ test_remote_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_i
|
|||
efl_gfx_hint_weight_set(box, 1.0, 1.0);
|
||||
efl_content_set(win, box);
|
||||
|
||||
o = efl_add(EFL_UI_TEXT_CLASS, box, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
|
||||
o = efl_add(EFL_UI_TEXTBOX_CLASS, box, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
|
||||
efl_text_wrap_set(o, EFL_TEXT_FORMAT_WRAP_MIXED);
|
||||
efl_gfx_hint_weight_set(o, 1.0, 1.0);
|
||||
efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE);
|
||||
|
|
@ -340,7 +340,7 @@ test_remote_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_i
|
|||
efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE);
|
||||
efl_pack(box, box2);
|
||||
|
||||
o = efl_add(EFL_UI_TEXT_CLASS, box2,
|
||||
o = efl_add(EFL_UI_TEXTBOX_CLASS, box2,
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE)
|
||||
);
|
||||
efl_text_set(o, "URL:");
|
||||
|
|
@ -388,7 +388,7 @@ test_click_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_in
|
|||
efl_pack(box, im);
|
||||
elm_object_focus_set(im, EINA_TRUE);
|
||||
|
||||
label = efl_add(EFL_UI_TEXT_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
|
||||
label = efl_add(EFL_UI_TEXTBOX_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
|
||||
efl_text_set(label, "<b>Press Return/Space/KP_Return key on image to transit.</b>");
|
||||
efl_gfx_hint_weight_set(label, 0.0, 0.0);
|
||||
efl_gfx_hint_fill_set(label, EINA_TRUE, EINA_TRUE);
|
||||
|
|
@ -451,7 +451,7 @@ _create_image(Eo *data, Eina_Bool async, Eina_Bool preload, Eina_Bool logo)
|
|||
status_text = efl_key_data_get(win, "phld");
|
||||
if (!status_text)
|
||||
{
|
||||
status_text = efl_add(EFL_UI_TEXT_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
|
||||
status_text = efl_add(EFL_UI_TEXTBOX_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
|
||||
efl_gfx_hint_weight_set(status_text, 1.0, 0);
|
||||
efl_gfx_hint_fill_set(status_text, EINA_TRUE, EINA_TRUE);
|
||||
efl_key_data_set(win, "phld", status_text);
|
||||
|
|
@ -541,7 +541,7 @@ test_load_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
|
|||
efl_gfx_hint_weight_set(hbox, 1.0, 0.0);
|
||||
efl_gfx_hint_fill_set(hbox, EINA_TRUE, EINA_FALSE);
|
||||
{
|
||||
label = efl_add(EFL_UI_TEXT_CLASS, win,
|
||||
label = efl_add(EFL_UI_TEXTBOX_CLASS, win,
|
||||
efl_text_set(efl_added, "Async load options:"),
|
||||
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
|
||||
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include <Efl_Ui.h>
|
||||
#include <Elementary.h>
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
|
||||
#include "test.h"
|
||||
static Eo *layout, *btn1, *btn2, *btn3;
|
||||
|
||||
|
|
@ -153,7 +153,7 @@ _setter_add(Eo *vbox, Eo *btn, Options option)
|
|||
efl_gfx_arrangement_content_padding_set(efl_added, 2, 2),
|
||||
efl_pack(vbox, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, hbox,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
|
||||
efl_text_set(efl_added, text),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_text_vertical_align_set(efl_added, 0.5),
|
||||
|
|
@ -207,7 +207,7 @@ _button_frame_add(Eo *box, Eo *btn)
|
|||
efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
|
||||
efl_pack(hbox, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, hbox,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
|
||||
efl_text_set(efl_added, "to"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_text_horizontal_align_set(efl_added, 0.5),
|
||||
|
|
@ -215,7 +215,7 @@ _button_frame_add(Eo *box, Eo *btn)
|
|||
efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
|
||||
efl_pack(hbox, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, hbox,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
|
||||
efl_text_set(efl_added, "relative"),
|
||||
efl_text_horizontal_align_set(efl_added, 0.5),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
|
|
@ -234,7 +234,7 @@ _button_frame_add(Eo *box, Eo *btn)
|
|||
efl_gfx_arrangement_content_padding_set(efl_added, 2, 2),
|
||||
efl_pack(vbox, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, hbox,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
|
||||
efl_text_set(efl_added, "align_x"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)),
|
||||
|
|
@ -254,7 +254,7 @@ _button_frame_add(Eo *box, Eo *btn)
|
|||
efl_gfx_arrangement_content_padding_set(efl_added, 2, 2),
|
||||
efl_pack(vbox, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, hbox,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
|
||||
efl_text_set(efl_added, "align_y"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)),
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#endif
|
||||
#include <Efl_Ui.h>
|
||||
#include <Elementary.h>
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
|
||||
static void
|
||||
_slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
|
||||
{
|
||||
|
|
@ -59,7 +59,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
|
|||
bx = efl_add(EFL_UI_BOX_CLASS, win,
|
||||
efl_content_set(win, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Horizontal"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
|
@ -72,7 +72,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
|
|||
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, _slider_drag_stop_cb, NULL),
|
||||
efl_pack(bx, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Horizontal Inverted"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
|
@ -83,7 +83,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
|
|||
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED),
|
||||
efl_pack(bx, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Manual step"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
|
@ -94,7 +94,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
|
|||
efl_ui_range_step_set(efl_added, 0.1),
|
||||
efl_pack(bx, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Disabled"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
|
@ -106,7 +106,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
|
|||
elm_object_disabled_set(efl_added, EINA_TRUE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Vertical"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
|
@ -139,7 +139,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
|
|||
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED),
|
||||
efl_pack(hbx, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Limit"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#endif
|
||||
#include <Efl_Ui.h>
|
||||
#include <Elementary.h>
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
|
||||
static double
|
||||
_step_size_calculate(double min, double max)
|
||||
{
|
||||
|
|
@ -40,7 +40,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
|
|||
bx = efl_add(EFL_UI_BOX_CLASS, win,
|
||||
efl_content_set(win, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Horizontal"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
|
@ -50,7 +50,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
|
|||
efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9),
|
||||
efl_pack(bx, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Manual step"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
|
@ -62,7 +62,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
|
|||
efl_ui_range_step_set(efl_added, step),
|
||||
efl_pack(bx, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Disabled"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
|
@ -75,7 +75,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
|
|||
elm_object_disabled_set(efl_added, EINA_TRUE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Vertical"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
|
@ -101,7 +101,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
|
|||
elm_object_disabled_set(efl_added, EINA_TRUE),
|
||||
efl_pack(hbx, efl_added));
|
||||
|
||||
efl_add(EFL_UI_TEXT_CLASS, bx,
|
||||
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
|
||||
efl_text_set(efl_added, "Limited (100-500)"),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_pack(bx, efl_added));
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include <Efl_Ui.h>
|
||||
#include <Elementary.h>
|
||||
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
|
||||
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
|
||||
|
||||
static void
|
||||
_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
|
||||
|
|
@ -42,7 +42,7 @@ _bt2_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
|
|||
// - With EO APIs, efl_gfx_hint_size_min_set() is safe to call as EFL will
|
||||
// only set the restricted min size (and combine them for calculation).
|
||||
|
||||
lb = efl_add(EFL_UI_TEXT_CLASS, dia,
|
||||
lb = efl_add(EFL_UI_TEXTBOX_CLASS, dia,
|
||||
efl_text_set(efl_added, "This is a non-resizable dialog."),
|
||||
efl_gfx_hint_size_min_set(efl_added, size),
|
||||
efl_gfx_hint_size_max_set(efl_added, size),
|
||||
|
|
@ -84,7 +84,7 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
|
|||
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
|
||||
efl_text_set(efl_added, "Min/Max Size Dialog"));
|
||||
|
||||
//lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
|
||||
//lb = efl_add(EFL_UI_TEXTBOX_CLASS, dia);,
|
||||
lb = elm_label_add(dia);
|
||||
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
|
||||
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb);
|
||||
|
|
@ -111,7 +111,7 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
|
|||
efl_text_set(efl_added, "Min/Max Size Dialog")
|
||||
);
|
||||
|
||||
//lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
|
||||
//lb = efl_add(EFL_UI_TEXTBOX_CLASS, dia);,
|
||||
lb = elm_label_add(dia);
|
||||
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
|
||||
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb);
|
||||
|
|
|
|||
|
|
@ -18,14 +18,18 @@
|
|||
|
||||
#include <iterator>
|
||||
|
||||
#include <Eina.hh>
|
||||
|
||||
#include "grammar/generator.hpp"
|
||||
#include "grammar/klass_def.hpp"
|
||||
#include "type_impl.hh" // For call_match
|
||||
#include "type_match.hh"
|
||||
#include "name_helpers.hh"
|
||||
#include "using_decl.hh"
|
||||
|
||||
namespace eolian_mono {
|
||||
|
||||
namespace eina = efl::eina;
|
||||
|
||||
template<typename OutputIterator, typename Context>
|
||||
struct unpack_event_args_visitor
|
||||
{
|
||||
|
|
@ -114,7 +118,7 @@ struct unpack_event_args_visitor
|
|||
return as_generator(conversion).generate(sink, attributes::unused, *context);
|
||||
};
|
||||
|
||||
if (eina::optional<bool> b = call_match(match_table, filter_func, accept_func))
|
||||
if (eina::optional<bool> b = type_match::get_match(match_table, filter_func, accept_func))
|
||||
return *b;
|
||||
else
|
||||
{
|
||||
|
|
@ -188,7 +192,7 @@ struct pack_event_info_and_call_visitor
|
|||
).generate(sink, attributes::unused, *context);
|
||||
};
|
||||
|
||||
if (eina::optional<bool> b = call_match(str_table, filter_func, str_accept_func))
|
||||
if (eina::optional<bool> b = type_match::get_match(str_table, filter_func, str_accept_func))
|
||||
return *b;
|
||||
|
||||
match const value_table [] =
|
||||
|
|
@ -206,7 +210,7 @@ struct pack_event_info_and_call_visitor
|
|||
).generate(sink, attributes::unused, *context);
|
||||
};
|
||||
|
||||
if (eina::optional<bool> b = call_match(value_table, filter_func, value_accept_func))
|
||||
if (eina::optional<bool> b = type_match::get_match(value_table, filter_func, value_accept_func))
|
||||
return *b;
|
||||
|
||||
return value_accept_func("e.args");
|
||||
|
|
|
|||
|
|
@ -21,25 +21,13 @@
|
|||
#include "grammar/case.hpp"
|
||||
#include "name_helpers.hh"
|
||||
#include "type_impl.hh"
|
||||
#include "type_match.hh"
|
||||
|
||||
namespace eolian_mono {
|
||||
|
||||
namespace eina = efl::eina;
|
||||
|
||||
namespace detail {
|
||||
|
||||
template <typename Array, typename SelectionPredicate, int N, typename AcceptFunc>
|
||||
eina::optional<bool> call_annotation_match(Array const (&array)[N], SelectionPredicate predicate, AcceptFunc acceptFunc)
|
||||
{
|
||||
typedef Array const* iterator_type;
|
||||
iterator_type match_iterator = &array[0], match_last = match_iterator + N;
|
||||
match_iterator = std::find_if(match_iterator, match_last, predicate);
|
||||
if(match_iterator != match_last)
|
||||
{
|
||||
return acceptFunc(match_iterator->function());
|
||||
}
|
||||
return {nullptr};
|
||||
}
|
||||
|
||||
template <typename OutputIterator, typename Context>
|
||||
struct marshall_annotation_visitor_generate
|
||||
|
|
@ -157,7 +145,7 @@ struct marshall_annotation_visitor_generate
|
|||
|
||||
const auto& match_table = is_return ? return_match_table : parameter_match_table;
|
||||
|
||||
if(eina::optional<bool> b = call_annotation_match(match_table, predicate, acceptCb))
|
||||
if(eina::optional<bool> b = type_match::get_match(match_table, predicate, acceptCb))
|
||||
{
|
||||
return *b;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -21,6 +21,7 @@
|
|||
#include "grammar/case.hpp"
|
||||
#include "helpers.hh"
|
||||
#include "name_helpers.hh"
|
||||
#include "type_match.hh"
|
||||
#include "type_impl.hh"
|
||||
#include "generation_contexts.hh"
|
||||
#include "blacklist.hh"
|
||||
|
|
@ -192,7 +193,7 @@ struct marshall_type_visitor_generate
|
|||
return as_generator(string << ".NativeStruct")
|
||||
.generate(sink, name_helpers::type_full_managed_name(regular), *context);
|
||||
}
|
||||
else if (eina::optional<bool> b = call_match
|
||||
else if (eina::optional<bool> b = type_match::get_match
|
||||
(match_table
|
||||
, [&] (match const& m)
|
||||
{
|
||||
|
|
@ -296,7 +297,7 @@ struct marshall_type_visitor_generate
|
|||
&& as_generator("<" << (type(false, false, true) % ", ") << ">").generate(sink, complex.subtypes, *context);
|
||||
};
|
||||
|
||||
if(eina::optional<bool> b = call_match
|
||||
if(eina::optional<bool> b = type_match::get_match
|
||||
(matches
|
||||
, [&] (match const& m)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -20,6 +20,7 @@
|
|||
#include "grammar/klass_def.hpp"
|
||||
#include "grammar/case.hpp"
|
||||
#include "name_helpers.hh"
|
||||
#include "type_match.hh"
|
||||
|
||||
namespace eolian_mono {
|
||||
|
||||
|
|
@ -69,19 +70,6 @@ attributes::complex_type_def replace_outer(attributes::complex_type_def v, attri
|
|||
v.outer = regular;
|
||||
return v;
|
||||
}
|
||||
|
||||
template <typename Array, typename F, int N, typename A>
|
||||
eina::optional<bool> call_match(Array const (&array)[N], F f, A a)
|
||||
{
|
||||
typedef Array const* iterator_type;
|
||||
iterator_type match_iterator = &array[0], match_last = match_iterator + N;
|
||||
match_iterator = std::find_if(match_iterator, match_last, f);
|
||||
if(match_iterator != match_last)
|
||||
{
|
||||
return a(match_iterator->function());
|
||||
}
|
||||
return {nullptr};
|
||||
}
|
||||
|
||||
template <typename OutputIterator, typename Context>
|
||||
struct visitor_regular_type_def_printer
|
||||
|
|
@ -248,7 +236,7 @@ struct visitor_generate
|
|||
}} // FIXME add proper support for any_value_ref
|
||||
};
|
||||
std::string full_type_name = name_helpers::type_full_eolian_name(regular);
|
||||
if(eina::optional<bool> b = call_match
|
||||
if(eina::optional<bool> b = type_match::get_match
|
||||
(optional_match_table
|
||||
, [&] (match const& m)
|
||||
{
|
||||
|
|
@ -271,7 +259,7 @@ struct visitor_generate
|
|||
is_optional = false;
|
||||
return (*this)(r);
|
||||
}
|
||||
else if(eina::optional<bool> b = call_match
|
||||
else if(eina::optional<bool> b = type_match::get_match
|
||||
(match_table
|
||||
, [&] (match const& m)
|
||||
{
|
||||
|
|
@ -441,7 +429,7 @@ struct visitor_generate
|
|||
// && detail::generate_pointers(sink, pointers, *context, false);
|
||||
};
|
||||
|
||||
if(eina::optional<bool> b = call_match
|
||||
if(eina::optional<bool> b = type_match::get_match
|
||||
(matches
|
||||
, [&] (match const& m)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -0,0 +1,46 @@
|
|||
/*
|
||||
* Copyright 2019 by its authors. See AUTHORS.
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
#ifndef EOLIAN_MONO_TYPE_MATCH_HH
|
||||
#define EOLIAN_MONO_TYPE_MATCH_HH
|
||||
|
||||
#include <Eina.hh>
|
||||
|
||||
namespace eolian_mono {
|
||||
|
||||
namespace type_match {
|
||||
|
||||
namespace eina = efl::eina;
|
||||
|
||||
/**
|
||||
* Apply the given AcceptFunction to the first element that matches the SelectionPredicate.
|
||||
*/
|
||||
template <typename Array, typename SelectionPredicate, int N, typename AcceptFunc>
|
||||
eina::optional<bool> get_match(Array const (&array)[N], SelectionPredicate predicate, AcceptFunc acceptFunc)
|
||||
{
|
||||
typedef Array const* iterator_type;
|
||||
iterator_type match_iterator = &array[0], match_last = match_iterator + N;
|
||||
match_iterator = std::find_if(match_iterator, match_last, predicate);
|
||||
if(match_iterator != match_last)
|
||||
{
|
||||
return acceptFunc(match_iterator->function());
|
||||
}
|
||||
return {nullptr};
|
||||
}
|
||||
|
||||
} // type_match
|
||||
|
||||
} // eolian_mono
|
||||
#endif
|
||||
|
|
@ -16,8 +16,8 @@
|
|||
//FIXME this can go away when efl_ui_text doesn't need elm_general
|
||||
# include <elm_general.h>
|
||||
# include <efl_text_interactive.eo.h>
|
||||
# include <efl_ui_text.eo.h>
|
||||
# include <efl_ui_text_async.eo.h>
|
||||
# include <efl_ui_textbox.eo.h>
|
||||
# include <efl_ui_textbox_async.eo.h>
|
||||
|
||||
#define NUM_ITEMS 400
|
||||
|
||||
|
|
@ -151,7 +151,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
|
|||
ibox = efl_add(EFL_UI_BOX_CLASS, item);
|
||||
efl_ui_layout_orientation_set(ibox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
|
||||
|
||||
txt = efl_add(EFL_UI_TEXT_CLASS, ibox);
|
||||
txt = efl_add(EFL_UI_TEXTBOX_CLASS, ibox);
|
||||
efl_gfx_hint_weight_set(txt, 0.95, EFL_GFX_HINT_EXPAND);
|
||||
efl_text_horizontal_align_set(txt, 0.2);
|
||||
efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
|
||||
|
|
@ -229,7 +229,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
|
|||
efl_pack_end(wbox, list);
|
||||
|
||||
/*select mode */
|
||||
txt = efl_add(EFL_UI_TEXT_CLASS, wbox);
|
||||
txt = efl_add(EFL_UI_TEXTBOX_CLASS, wbox);
|
||||
efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01);
|
||||
efl_text_horizontal_align_set(txt, 0.02);
|
||||
efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
|
||||
|
|
@ -256,7 +256,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
|
|||
efl_event_callback_add(bbox, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, _select_radio_changed, list);
|
||||
|
||||
/* scroll mode */
|
||||
txt = efl_add(EFL_UI_TEXT_CLASS, wbox);
|
||||
txt = efl_add(EFL_UI_TEXTBOX_CLASS, wbox);
|
||||
efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01);
|
||||
efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
|
||||
efl_text_horizontal_align_set(txt, 0.02);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ public class Example
|
|||
private static void ShowErrorPopup(Efl.Ui.Win win, string message)
|
||||
{
|
||||
Efl.Ui.AlertPopup popup = new Efl.Ui.AlertPopup(win);
|
||||
Efl.Ui.Text popup_text = new Efl.Ui.Text(popup);
|
||||
Efl.Ui.Textbox popup_text = new Efl.Ui.Textbox(popup);
|
||||
popup_text.SetText($"Error: {message}");
|
||||
popup.SetContent(popup_text);
|
||||
popup.SetVisible(true);
|
||||
|
|
@ -68,12 +68,12 @@ public class Example
|
|||
|
||||
box.DoPack(miles_box);
|
||||
|
||||
Efl.Ui.Text miles_label = new Efl.Ui.Text(miles_box);
|
||||
Efl.Ui.Textbox miles_label = new Efl.Ui.Textbox(miles_box);
|
||||
miles_label.SetText("Miles:");
|
||||
miles_label.SetSize(size);
|
||||
miles_label.SetVisible(true);
|
||||
|
||||
Efl.Ui.Text miles_input = new Efl.Ui.Text(miles_box);
|
||||
Efl.Ui.Textbox miles_input = new Efl.Ui.Textbox(miles_box);
|
||||
miles_input.SetText("");
|
||||
miles_input.SetScrollable(true);
|
||||
miles_input.SetEditable(true);
|
||||
|
|
@ -95,12 +95,12 @@ public class Example
|
|||
|
||||
box.DoPack(kms_box);
|
||||
|
||||
Efl.Ui.Text kms_label = new Efl.Ui.Text(kms_box);
|
||||
Efl.Ui.Textbox kms_label = new Efl.Ui.Textbox(kms_box);
|
||||
kms_label.SetText("Kilometers:");
|
||||
kms_label.SetSize(size);
|
||||
kms_label.SetVisible(true);
|
||||
|
||||
Efl.Ui.TextEditable kms_input = new Efl.Ui.TextEditable(kms_box);
|
||||
Efl.Ui.TextboxEditable kms_input = new Efl.Ui.TextboxEditable(kms_box);
|
||||
kms_input.SetText("");
|
||||
kms_input.SetScrollable(true);
|
||||
kms_input.SetSize(size);
|
||||
|
|
|
|||
|
|
@ -34,19 +34,19 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
|
|||
// FIXME
|
||||
// table.homogeneous_set(true);
|
||||
|
||||
efl::ui::Text label(instantiate, win);
|
||||
efl::ui::Textbox label(instantiate, win);
|
||||
label.text_set("label 0");
|
||||
table.pack_table(label, 0, 0, 1, 1);
|
||||
|
||||
efl::ui::Text label1(instantiate, win);
|
||||
efl::ui::Textbox label1(instantiate, win);
|
||||
label1.text_set("label 1");
|
||||
table.pack_table(label1, 1, 0, 1, 1);
|
||||
|
||||
efl::ui::Text label2(instantiate, win);
|
||||
efl::ui::Textbox label2(instantiate, win);
|
||||
label2.text_set("label 2");
|
||||
table.pack_table(label2, 0, 1, 1, 1);
|
||||
|
||||
efl::ui::Text label3(instantiate, win);
|
||||
efl::ui::Textbox label3(instantiate, win);
|
||||
label3.text_set("label 3");
|
||||
table.pack_table(label3, 1, 1, 1, 1);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1126,12 +1126,8 @@ EAPI void ecore_con_socks_apply_always(Ecore_Con_Socks *ecs);
|
|||
* server to client and client to server, can be represented in the following
|
||||
* sequence diagram:
|
||||
*
|
||||
* @htmlonly
|
||||
* <img src="ecore_con-client-server.png" style="max-width: 400px"/>
|
||||
* <a href="ecore_con-client-server.png">Full size</a>
|
||||
* @endhtmlonly
|
||||
*
|
||||
* @image rtf ecore_con-client-server.png
|
||||
* @image html ecore_con-client-server.png
|
||||
* @image latex ecore_con-client-server.eps width=\\textwidth
|
||||
*
|
||||
* Please notice the important difference between these two codes: the first is
|
||||
|
|
|
|||
|
|
@ -64,7 +64,7 @@ _ector_software_buffer_base_pixels_clear(Eo *obj EINA_UNUSED, Ector_Software_Buf
|
|||
}
|
||||
|
||||
EOLIAN static Eina_Bool
|
||||
_ector_software_buffer_base_ector_buffer_pixels_get(Eo *obj, Ector_Software_Buffer_Base_Data *pd,
|
||||
_ector_software_buffer_base_ector_buffer_pixels_get(Eo *obj EINA_UNUSED, Ector_Software_Buffer_Base_Data *pd,
|
||||
void **pixels, int* width, int* height, int* stride)
|
||||
{
|
||||
if (*pixels) *pixels = pd->pixels.u8;
|
||||
|
|
|
|||
|
|
@ -184,10 +184,8 @@
|
|||
* (argument of @ref eina_hash_new too). The following picture illustrates the
|
||||
* basic idea:
|
||||
*
|
||||
* @htmlonly
|
||||
* <img src="01_hash-table.png" width="500" />
|
||||
* @endhtmlonly
|
||||
* @image latex 01_hash-table.eps
|
||||
* @image html 01_hash-table.png
|
||||
*
|
||||
* Adding an element to the hash table involves the following steps:
|
||||
* @li calculate the hash for that key (using the specified hash function);
|
||||
|
|
|
|||
|
|
@ -150,7 +150,11 @@ eina_value_flush(Eina_Value *value)
|
|||
}
|
||||
else if (type == EINA_VALUE_TYPE_STRING)
|
||||
{
|
||||
if (value->value.ptr) free(value->value.ptr);
|
||||
if (value->value.ptr)
|
||||
{
|
||||
free(value->value.ptr);
|
||||
value->value.ptr = NULL;
|
||||
}
|
||||
}
|
||||
else if (type->value_size > 8)
|
||||
eina_value_inner_free(type->value_size, mem);
|
||||
|
|
|
|||
|
|
@ -153,10 +153,8 @@
|
|||
* The two lists, sharing some elements, can be represented by the following
|
||||
* picture:
|
||||
*
|
||||
* @htmlonly
|
||||
* <img src="eina_inlist-node_eg2-list-inlist.png" style="max-width: 100%;"/>
|
||||
* @endhtmlonly
|
||||
* @image rtf eina_inlist-node_eg2-list-inlist.png
|
||||
* @image html eina_inlist-node_eg2-list-inlist.png
|
||||
* @image latex eina_inlist-node_eg2-list-inlist.eps "" width=\textwidth
|
||||
*
|
||||
* Accessing both lists is done normally, as if they didn't have any elements in
|
||||
|
|
@ -229,10 +227,8 @@
|
|||
*
|
||||
* And the resulting lists will be as follow:
|
||||
*
|
||||
* @htmlonly
|
||||
* <img src="eina_inlist-node_eg3-two-inlists.png" style="max-width: 100%;"/>
|
||||
* @endhtmlonly
|
||||
* @image rtf eina_inlist-node_eg3-two-inlists.png
|
||||
* @image html eina_inlist-node_eg3-two-inlists.png
|
||||
* @image latex eina_inlist-node_eg3-two-inlists.eps "" width=\textwidth
|
||||
*
|
||||
* For the first list, we can use the macro @ref EINA_INLIST_FOREACH to iterate
|
||||
|
|
|
|||
|
|
@ -49,11 +49,8 @@
|
|||
* @until eina_init
|
||||
* Here we add a sequence of elements to our list. By using append we add
|
||||
* elements to the end of the list, so the list will look like this:@n
|
||||
* @htmlonly
|
||||
* <img src="eina_list_example_01_a.png" style="max-width: 100%;" />
|
||||
* <a href="eina_list_example_01_a.png">Full-size</a>
|
||||
* @endhtmlonly
|
||||
* @image rtf eina_list_example_01_a.png
|
||||
* @image html eina_list_example_01_a.png
|
||||
* @image latex eina_list_example_01_a.eps "" width=\textwidth
|
||||
* @until roslin
|
||||
* There are a couple of interesting things happening here, first is that we are
|
||||
|
|
@ -82,11 +79,8 @@
|
|||
* far:
|
||||
* @until lampkin
|
||||
* With this additions our list now looks like this:@n
|
||||
* @htmlonly
|
||||
* <img src="eina_list_example_01_b.png" style="max-width: 100%;" />
|
||||
* <a href="eina_list_example_01_b.png">Full-size</a>
|
||||
* @endhtmlonly
|
||||
* @image rtf eina_list_example_01_b.png
|
||||
* @image html eina_list_example_01_b.png
|
||||
* @image latex eina_list_example_01_b.eps "" width=\textwidth
|
||||
*
|
||||
* Once done using the list it needs to be freed, and since we are done with
|
||||
|
|
@ -255,11 +249,8 @@
|
|||
* @ref Eina_List nodes keep references to the previous node, the next node, its
|
||||
* data and to an accounting structure.
|
||||
*
|
||||
* @htmlonly
|
||||
* <img src="eina_list.png" style="max-width: 100%;" />
|
||||
* <a href="eina_list.png">Full-size</a>
|
||||
* @endhtmlonly
|
||||
* @image rtf eina_list.png
|
||||
* @image html eina_list.png
|
||||
* @image latex eina_list.eps width=5cm
|
||||
*
|
||||
* @ref Eina_List_Accounting is used to improve the performance of some
|
||||
|
|
@ -1388,11 +1379,8 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data)
|
|||
*
|
||||
* The following diagram illustrates this macro iterating over a list of four
|
||||
* elements("one", "two", "three" and "four"):
|
||||
* @htmlonly
|
||||
* <img src="eina-list-foreach.png" style="max-width: 100%;" />
|
||||
* <a href="eina-list-foreach.png">Full-size</a>
|
||||
* @endhtmlonly
|
||||
* @image latex eina-list-foreach.eps "" width=\textwidth
|
||||
* @image html eina-list-foreach.png
|
||||
*
|
||||
* It can be used to free list data, as in the following example:
|
||||
*
|
||||
|
|
@ -1450,11 +1438,8 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data)
|
|||
*
|
||||
* The following diagram illustrates this macro iterating over a list of four
|
||||
* elements("one", "two", "three" and "four"):
|
||||
* @htmlonly
|
||||
* <img src="eina-list-reverse-foreach.png" style="max-width: 100%;" />
|
||||
* <a href="eina-list-reverse-foreach.png">Full-size</a>
|
||||
* @endhtmlonly
|
||||
* @image latex eina-list-reverse-foreach.eps "" width=\textwidth
|
||||
* @image html eina-list-reverse-foreach.png
|
||||
*
|
||||
* It can be used to free list data, as in the following example:
|
||||
*
|
||||
|
|
@ -1513,11 +1498,8 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data)
|
|||
*
|
||||
* The following diagram illustrates this macro iterating over a list of four
|
||||
* elements ("one", "two", "three" and "four"):
|
||||
* @htmlonly
|
||||
* <img src="eina-list-foreach-safe.png" style="max-width: 100%;" />
|
||||
* <a href="eina-list-foreach-safe.png">Full-size</a>
|
||||
* @endhtmlonly
|
||||
* @image latex eina-list-foreach-safe.eps "" width=\textwidth
|
||||
* @image html eina-list-foreach-safe.png
|
||||
*
|
||||
* This macro can be used to free list nodes, as in the following example:
|
||||
*
|
||||
|
|
@ -1574,11 +1556,8 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data)
|
|||
*
|
||||
* The following diagram illustrates this macro iterating over a list of four
|
||||
* elements ("one", "two", "three" and "four"):
|
||||
* @htmlonly
|
||||
* <img src="eina-list-reverse-foreach-safe.png" style="max-width: 100%;" />
|
||||
* <a href="eina-list-reverse-foreach-safe.png">Full-size</a>
|
||||
* @endhtmlonly
|
||||
* @image latex eina-list-reverse-foreach-safe.eps "" width=\textwidth
|
||||
* @image html eina-list-reverse-foreach-safe.png
|
||||
*
|
||||
* This macro can be used to free list nodes, as in the following example:
|
||||
*
|
||||
|
|
@ -1627,11 +1606,8 @@ EAPI int eina_list_data_idx(const Eina_List *list, void *data)
|
|||
*
|
||||
* The following diagram illustrates this macro iterating over a list of four
|
||||
* elements ("one", "two", "three" and "four"):
|
||||
* @htmlonly
|
||||
* <img src="eina-list-free.png" style="max-width: 100%;" />
|
||||
* <a href="eina-list-free.png">Full-size</a>
|
||||
* @endhtmlonly
|
||||
* @image latex eina-list-free.eps "" width=\textwidth
|
||||
* @image html eina-list-free.png
|
||||
*
|
||||
* If you do not need to release node data, it is easier to call #eina_list_free().
|
||||
*
|
||||
|
|
|
|||
|
|
@ -226,8 +226,8 @@ EAPI Eina_Bool efl_ui_win_autodel_get(const Efl_Ui_Win *obj);
|
|||
typedef void (*Context_Item_Clicked_Cb)(void *data, Eo *obj, void *event_info);
|
||||
|
||||
# include <efl_text_interactive.eo.h>
|
||||
# include <efl_ui_text.eo.h>
|
||||
# include <efl_ui_text_async.eo.h>
|
||||
# include <efl_ui_textbox.eo.h>
|
||||
# include <efl_ui_textbox_async.eo.h>
|
||||
|
||||
# include <efl_ui_animation_view.eo.h>
|
||||
# include <efl_ui_clock.eo.h>
|
||||
|
|
|
|||
|
|
@ -197,11 +197,11 @@ field_create(Eo *obj, Efl_Ui_Clock_Type field_type)
|
|||
}
|
||||
else
|
||||
{
|
||||
field_obj = efl_add(EFL_UI_TEXT_CLASS,obj,
|
||||
field_obj = efl_add(EFL_UI_TEXTBOX_CLASS,obj,
|
||||
efl_text_multiline_set(efl_added, EINA_FALSE),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
|
||||
efl_input_text_input_panel_autoshow_set(efl_added, EINA_FALSE),
|
||||
efl_ui_text_context_menu_disabled_set(efl_added, EINA_TRUE));
|
||||
efl_ui_textbox_context_menu_disabled_set(efl_added, EINA_TRUE));
|
||||
}
|
||||
evas_object_data_set(field_obj, "_field_type", (void *)field_type);
|
||||
|
||||
|
|
|
|||
|
|
@ -754,10 +754,10 @@ _view_init(Evas_Object *obj, Efl_Ui_Tags_Data *sd)
|
|||
if (!sd->label) return;
|
||||
elm_widget_element_update(obj, sd->label, PART_NAME_LABEL);
|
||||
|
||||
sd->entry = efl_add(EFL_UI_TEXT_CLASS, sd->box,
|
||||
sd->entry = efl_add(EFL_UI_TEXTBOX_CLASS, sd->box,
|
||||
efl_text_multiline_set(efl_added, EINA_FALSE),
|
||||
efl_text_set(efl_added, ""),
|
||||
efl_ui_text_cnp_mode_set(efl_added, EFL_UI_SELECTION_FORMAT_MARKUP),
|
||||
efl_ui_textbox_cnp_mode_set(efl_added, EFL_UI_SELECTION_FORMAT_MARKUP),
|
||||
efl_input_text_input_panel_autoshow_set(efl_added, EINA_FALSE),
|
||||
efl_text_interactive_editable_set(efl_added, EINA_TRUE),
|
||||
efl_composite_attach(obj, efl_added));
|
||||
|
|
|
|||
|
|
@ -1,9 +0,0 @@
|
|||
class @beta Efl.Ui.Text_Async extends Efl.Ui.Text
|
||||
{
|
||||
[[Efl UI text async class
|
||||
]]
|
||||
data: null;
|
||||
implements {
|
||||
Efl.Object.constructor;
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,4 +1,4 @@
|
|||
class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
|
||||
class @beta Efl.Ui.Textbox extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
|
||||
Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, Efl.Input_Text
|
||||
composites
|
||||
Efl.Text_Interactive, Efl.Text_Markup
|
||||
|
|
@ -0,0 +1,9 @@
|
|||
class @beta Efl.Ui.Textbox_Async extends Efl.Ui.Textbox
|
||||
{
|
||||
[[Efl UI textbox async class
|
||||
]]
|
||||
data: null;
|
||||
implements {
|
||||
Efl.Object.constructor;
|
||||
}
|
||||
}
|
||||
|
|
@ -58,9 +58,9 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
|
|||
}
|
||||
SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED)
|
||||
SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
|
||||
SIG_FWD(SELECTION_PASTE, EFL_UI_TEXT_EVENT_SELECTION_PASTE)
|
||||
SIG_FWD(SELECTION_COPY, EFL_UI_TEXT_EVENT_SELECTION_COPY)
|
||||
SIG_FWD(SELECTION_CUT, EFL_UI_TEXT_EVENT_SELECTION_CUT)
|
||||
SIG_FWD(SELECTION_PASTE, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE)
|
||||
SIG_FWD(SELECTION_COPY, EFL_UI_TEXTBOX_EVENT_SELECTION_COPY)
|
||||
SIG_FWD(SELECTION_CUT, EFL_UI_TEXTBOX_EVENT_SELECTION_CUT)
|
||||
#undef SIG_FWD
|
||||
|
||||
#define SIG_FWD(name, event) \
|
||||
|
|
@ -249,9 +249,9 @@ _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Ent
|
|||
SIG_FWD(CHANGED, ELM_ENTRY_EVENT_CHANGED);
|
||||
SIG_FWD(ACTIVATED, ELM_ENTRY_EVENT_ACTIVATED);
|
||||
SIG_FWD(PRESS, ELM_ENTRY_EVENT_PRESS);
|
||||
SIG_FWD(SELECTION_PASTE, EFL_UI_TEXT_EVENT_SELECTION_PASTE);
|
||||
SIG_FWD(SELECTION_COPY, EFL_UI_TEXT_EVENT_SELECTION_COPY);
|
||||
SIG_FWD(SELECTION_CUT, EFL_UI_TEXT_EVENT_SELECTION_CUT);
|
||||
SIG_FWD(SELECTION_PASTE, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE);
|
||||
SIG_FWD(SELECTION_COPY, EFL_UI_TEXTBOX_EVENT_SELECTION_COPY);
|
||||
SIG_FWD(SELECTION_CUT, EFL_UI_TEXTBOX_EVENT_SELECTION_CUT);
|
||||
#undef SIG_FWD
|
||||
#define SIG_FWD(name, event) \
|
||||
evas_object_smart_callback_add(priv->entry, event, _##name##_fwd, obj)
|
||||
|
|
|
|||
|
|
@ -1588,7 +1588,7 @@ _paste_cb(void *data,
|
|||
|
||||
if (!sd) return;
|
||||
efl_event_callback_legacy_call
|
||||
(data, EFL_UI_TEXT_EVENT_SELECTION_PASTE, NULL);
|
||||
(data, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE, NULL);
|
||||
|
||||
sd->selection_asked = EINA_TRUE;
|
||||
|
||||
|
|
@ -1643,7 +1643,7 @@ _cut_cb(void *data,
|
|||
|
||||
if (!sd) return;
|
||||
efl_event_callback_legacy_call
|
||||
(data, EFL_UI_TEXT_EVENT_SELECTION_CUT, NULL);
|
||||
(data, EFL_UI_TEXTBOX_EVENT_SELECTION_CUT, NULL);
|
||||
/* Store it */
|
||||
sd->sel_mode = EINA_FALSE;
|
||||
if (!_elm_config->desktop_entry)
|
||||
|
|
@ -1667,7 +1667,7 @@ _copy_cb(void *data,
|
|||
|
||||
if (!sd) return;
|
||||
efl_event_callback_legacy_call
|
||||
(data, EFL_UI_TEXT_EVENT_SELECTION_COPY, NULL);
|
||||
(data, EFL_UI_TEXTBOX_EVENT_SELECTION_COPY, NULL);
|
||||
sd->sel_mode = EINA_FALSE;
|
||||
if (!_elm_config->desktop_entry)
|
||||
{
|
||||
|
|
@ -2454,7 +2454,7 @@ _entry_paste_request_signal_cb(void *data,
|
|||
// supported
|
||||
// if ((type == ELM_SEL_TYPE_PRIMARY) && _entry_win_is_wl(data)) return;
|
||||
efl_event_callback_legacy_call
|
||||
(data, EFL_UI_TEXT_EVENT_SELECTION_PASTE, NULL);
|
||||
(data, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE, NULL);
|
||||
|
||||
top = _entry_win_get(data);
|
||||
if (top)
|
||||
|
|
|
|||
|
|
@ -170,8 +170,8 @@
|
|||
//FIXME this needs to not use elm_general.h and go to Efl_Ui.h
|
||||
# include <elm_general.h>
|
||||
# include <efl_text_interactive.eo.h>
|
||||
# include <efl_ui_text.eo.h>
|
||||
# include <efl_ui_text_async.eo.h>
|
||||
# include <efl_ui_textbox.eo.h>
|
||||
# include <efl_ui_textbox_async.eo.h>
|
||||
|
||||
extern const char *_efl_model_property_itemw;
|
||||
extern const char *_efl_model_property_itemh;
|
||||
|
|
|
|||
|
|
@ -80,12 +80,12 @@ pub_eo_files = [
|
|||
'efl_ui_table.eo',
|
||||
'efl_ui_table_static.eo',
|
||||
'efl_text_interactive.eo',
|
||||
'efl_ui_text.eo',
|
||||
'efl_ui_textbox.eo',
|
||||
'efl_ui_popup.eo',
|
||||
'efl_ui_popup_part_backwall.eo',
|
||||
'efl_ui_alert_popup.eo',
|
||||
'efl_ui_alert_popup_part_title.eo',
|
||||
'efl_ui_text_async.eo',
|
||||
'efl_ui_textbox_async.eo',
|
||||
'efl_ui_text_factory_images.eo',
|
||||
'efl_ui_text_factory_emoticons.eo',
|
||||
'efl_ui_text_factory_fallback.eo',
|
||||
|
|
@ -874,7 +874,7 @@ elementary_src = [
|
|||
'efl_ui_table_static.c',
|
||||
'efl_ui_table_layout.c',
|
||||
'efl_ui_table_private.h',
|
||||
'efl_ui_text.c',
|
||||
'efl_ui_textbox.c',
|
||||
'efl_ui_text_factory_images.c',
|
||||
'efl_ui_text_factory_emoticons.c',
|
||||
'efl_ui_text_factory_fallback.c',
|
||||
|
|
|
|||
|
|
@ -1629,17 +1629,11 @@ EAPI const Evas_Device *evas_device_emulation_source_get(const Evas_Device *dev)
|
|||
* treated specially on resizing scales, by keeping their aspect. This
|
||||
* makes setting frames around other objects on UIs easy.
|
||||
* See the following figures for a visual explanation:\n
|
||||
* @htmlonly
|
||||
* <img src="image-borders.png" style="max-width: 100%;" />
|
||||
* <a href="image-borders.png">Full-size</a>
|
||||
* @endhtmlonly
|
||||
* @image rtf image-borders.png
|
||||
* @image html image-borders.png
|
||||
* @image latex image-borders.eps width=\textwidth
|
||||
* @htmlonly
|
||||
* <img src="border-effect.png" style="max-width: 100%;" />
|
||||
* <a href="border-effect.png">Full-size</a>
|
||||
* @endhtmlonly
|
||||
* @image rtf border-effect.png
|
||||
* @image html border-effect.png
|
||||
* @image latex border-effect.eps width=\textwidth
|
||||
*
|
||||
* @section Evas_Object_Image_Manipulation Manipulating pixels
|
||||
|
|
|
|||
Loading…
Reference in New Issue