diff options
author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2018-02-12 16:02:06 -0500 |
---|---|---|
committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2018-02-12 16:38:51 -0500 |
commit | f85325d924d93e84ffee08b7bffd39d33347998f (patch) | |
tree | 802baed979afeeeb929f5b3c3c996ee5ce870f0a /src/lib/efl | |
parent | 05200163ed7461d3904bd9320dc9b578269f8bd9 (diff) |
interfaces: remove Efl.Text.Properties
this is provided in Efl.Text.Font
Diffstat (limited to 'src/lib/efl')
-rw-r--r-- | src/lib/efl/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/lib/efl/Efl.h | 1 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_interfaces_main.c | 1 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_text_font.eo | 2 | ||||
-rw-r--r-- | src/lib/efl/interfaces/efl_text_properties.eo | 60 |
5 files changed, 1 insertions, 64 deletions
diff --git a/src/lib/efl/CMakeLists.txt b/src/lib/efl/CMakeLists.txt index dde72d7039..909cea5b5b 100644 --- a/src/lib/efl/CMakeLists.txt +++ b/src/lib/efl/CMakeLists.txt | |||
@@ -48,7 +48,6 @@ set(PUBLIC_EO_FILES | |||
48 | interfaces/efl_player.eo | 48 | interfaces/efl_player.eo |
49 | interfaces/efl_screen.eo | 49 | interfaces/efl_screen.eo |
50 | interfaces/efl_text.eo | 50 | interfaces/efl_text.eo |
51 | interfaces/efl_text_properties.eo | ||
52 | interfaces/efl_text_types.eot | 51 | interfaces/efl_text_types.eot |
53 | interfaces/efl_types.eot | 52 | interfaces/efl_types.eot |
54 | interfaces/efl_ui_item.eo | 53 | interfaces/efl_ui_item.eo |
diff --git a/src/lib/efl/Efl.h b/src/lib/efl/Efl.h index 5f47825b0c..cf3f17305d 100644 --- a/src/lib/efl/Efl.h +++ b/src/lib/efl/Efl.h | |||
@@ -86,7 +86,6 @@ typedef Efl_Gfx_Path_Command_Type Efl_Gfx_Path_Command; | |||
86 | #include "interfaces/efl_player.eo.h" | 86 | #include "interfaces/efl_player.eo.h" |
87 | #include "interfaces/efl_text.eo.h" | 87 | #include "interfaces/efl_text.eo.h" |
88 | #include "interfaces/efl_text_types.eot.h" | 88 | #include "interfaces/efl_text_types.eot.h" |
89 | #include "interfaces/efl_text_properties.eo.h" | ||
90 | #include "interfaces/efl_orientation.eo.h" | 89 | #include "interfaces/efl_orientation.eo.h" |
91 | #include "interfaces/efl_ui_base.eo.h" | 90 | #include "interfaces/efl_ui_base.eo.h" |
92 | #include "interfaces/efl_ui_direction.eo.h" | 91 | #include "interfaces/efl_ui_direction.eo.h" |
diff --git a/src/lib/efl/interfaces/efl_interfaces_main.c b/src/lib/efl/interfaces/efl_interfaces_main.c index 1419f747b3..8934b2ecde 100644 --- a/src/lib/efl/interfaces/efl_interfaces_main.c +++ b/src/lib/efl/interfaces/efl_interfaces_main.c | |||
@@ -18,7 +18,6 @@ | |||
18 | #include "interfaces/efl_playable.eo.c" | 18 | #include "interfaces/efl_playable.eo.c" |
19 | #include "interfaces/efl_player.eo.c" | 19 | #include "interfaces/efl_player.eo.c" |
20 | #include "interfaces/efl_text.eo.c" | 20 | #include "interfaces/efl_text.eo.c" |
21 | #include "interfaces/efl_text_properties.eo.c" | ||
22 | #include "interfaces/efl_text_font.eo.c" | 21 | #include "interfaces/efl_text_font.eo.c" |
23 | #include "interfaces/efl_text_style.eo.c" | 22 | #include "interfaces/efl_text_style.eo.c" |
24 | #include "interfaces/efl_text_format.eo.c" | 23 | #include "interfaces/efl_text_format.eo.c" |
diff --git a/src/lib/efl/interfaces/efl_text_font.eo b/src/lib/efl/interfaces/efl_text_font.eo index 8a27829541..4daf73aef2 100644 --- a/src/lib/efl/interfaces/efl_text_font.eo +++ b/src/lib/efl/interfaces/efl_text_font.eo | |||
@@ -1,5 +1,5 @@ | |||
1 | // src/lib/efl/interfaces/efl_text_font.eo | 1 | // src/lib/efl/interfaces/efl_text_font.eo |
2 | 2 | import efl_gfx_types; | |
3 | enum Efl.Text.Font.Weight { | 3 | enum Efl.Text.Font.Weight { |
4 | [[Type of font weight]] | 4 | [[Type of font weight]] |
5 | normal, [[Normal font weight]] | 5 | normal, [[Normal font weight]] |
diff --git a/src/lib/efl/interfaces/efl_text_properties.eo b/src/lib/efl/interfaces/efl_text_properties.eo deleted file mode 100644 index 8552fae4dd..0000000000 --- a/src/lib/efl/interfaces/efl_text_properties.eo +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | import efl_gfx_types; | ||
2 | |||
3 | interface Efl.Text.Properties | ||
4 | { | ||
5 | [[Efl text properties interface]] | ||
6 | methods { | ||
7 | @property font { | ||
8 | set { | ||
9 | [[Set the font family, filename and size for a given text object. | ||
10 | |||
11 | This function allows the font name and size of a text object to | ||
12 | be set. The font string has to follow fontconfig's convention for | ||
13 | naming fonts, as it's the underlying library used to query system | ||
14 | fonts by Evas (see the fc-list command's output, on your system, | ||
15 | to get an idea). Alternatively, youe can use the full path to a font | ||
16 | file. | ||
17 | |||
18 | See also @.font.get, @.font_source.get. | ||
19 | ]] | ||
20 | } | ||
21 | get { | ||
22 | [[Retrieve the font family and size in use on a given text object. | ||
23 | |||
24 | This function allows the font name and size of a text object to | ||
25 | be queried. Remember that the font name string is still owned by | ||
26 | Evas and should not have free() called on it by the caller of the | ||
27 | function. | ||
28 | |||
29 | See also @.font.set. | ||
30 | ]] | ||
31 | } | ||
32 | values { | ||
33 | font: string; [[The font family name or filename.]] | ||
34 | size: Efl.Font.Size; [[The font size, in points.]] | ||
35 | } | ||
36 | } | ||
37 | @property font_source { | ||
38 | set { | ||
39 | [[Set the font (source) file to be used on a given text object. | ||
40 | |||
41 | This function allows the font file to be explicitly set for a | ||
42 | given text object, overriding system lookup, which will first | ||
43 | occur in the given file's contents. | ||
44 | |||
45 | See also @.font.set. | ||
46 | ]] | ||
47 | } | ||
48 | get { | ||
49 | [[Get the font file's path which is being used on a given text | ||
50 | object. | ||
51 | |||
52 | See @.font.get for more details. | ||
53 | ]] | ||
54 | } | ||
55 | values { | ||
56 | font_source: string; [[The font file's path.]] | ||
57 | } | ||
58 | } | ||
59 | } | ||
60 | } | ||