summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--NEWS2
-rw-r--r--src/lib/eina/eina_tiler.c7
-rw-r--r--src/lib/eina/eina_tiler.h15
4 files changed, 26 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index dc773b46a6..978d1b46bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-07-08 Mike Blumenkrantz
2
3 * add eina_tiler_area_size_get
4
12013-07-06 Carsten Haitzler (The Rasterman) 52013-07-06 Carsten Haitzler (The Rasterman)
2 6
3 * Add direct eina file map populate controls 7 * Add direct eina file map populate controls
diff --git a/NEWS b/NEWS
index 3ffbb8c85b..afafabe956 100644
--- a/NEWS
+++ b/NEWS
@@ -31,7 +31,7 @@ Additions:
31 - Add eina_inlist_last 31 - Add eina_inlist_last
32 - Add eina_str_convert_len() to work around broken eina_str_convert() 32 - Add eina_str_convert_len() to work around broken eina_str_convert()
33 - Add eina_file_dup() 33 - Add eina_file_dup()
34 - Add eina_tiler_area_size_set(), eina_tiler_strict_set() 34 - Add eina_tiler_area_size_set(), eina_tiler_strict_set(), eina_tiler_area_size_get()
35 - Add eina_file_map_populate() 35 - Add eina_file_map_populate()
36 * Eet: 36 * Eet:
37 - Add eet_mmap() 37 - Add eet_mmap()
diff --git a/src/lib/eina/eina_tiler.c b/src/lib/eina/eina_tiler.c
index fb22bf2e73..e122712eed 100644
--- a/src/lib/eina/eina_tiler.c
+++ b/src/lib/eina/eina_tiler.c
@@ -1169,6 +1169,13 @@ EAPI void eina_tiler_area_size_set(Eina_Tiler *t, int w, int h)
1169 t->area.h = h; 1169 t->area.h = h;
1170} 1170}
1171 1171
1172EAPI void eina_tiler_area_size_get(const Eina_Tiler *t, int *w, int *h)
1173{
1174 EINA_MAGIC_CHECK_TILER(t);
1175 if (w) *w = t->area.w;
1176 if (h) *h = t->area.h;
1177}
1178
1172EAPI void eina_tiler_tile_size_set(Eina_Tiler *t, int w, int h) 1179EAPI void eina_tiler_tile_size_set(Eina_Tiler *t, int w, int h)
1173{ 1180{
1174 EINA_MAGIC_CHECK_TILER(t); 1181 EINA_MAGIC_CHECK_TILER(t);
diff --git a/src/lib/eina/eina_tiler.h b/src/lib/eina/eina_tiler.h
index 491fc6a036..e1de173128 100644
--- a/src/lib/eina/eina_tiler.h
+++ b/src/lib/eina/eina_tiler.h
@@ -213,11 +213,24 @@ EAPI void eina_tiler_tile_size_set(Eina_Tiler *t, int w, int h);
213 * @param w Width of the area. 213 * @param w Width of the area.
214 * @param h Height of the area. 214 * @param h Height of the area.
215 * 215 *
216 * Better clear the tiler before changing it's size. 216 * @since 1.8
217 *
218 * @warning Must clear the tiler before changing its size.
217 */ 219 */
218EAPI void eina_tiler_area_size_set(Eina_Tiler *t, int w, int h); 220EAPI void eina_tiler_area_size_set(Eina_Tiler *t, int w, int h);
219 221
220/** 222/**
223 * @brief Get the size of the area covered by the tiler.
224 *
225 * @param t The tiler whose area size will be fetched.
226 * @param w Width of the area.
227 * @param h Height of the area.
228 *
229 * @since 1.8
230 */
231EAPI void eina_tiler_area_size_get(const Eina_Tiler *t, int *w, int *h);
232
233/**
221 * @brief Define if we need to follow a strict grid of tile or a loosy one 234 * @brief Define if we need to follow a strict grid of tile or a loosy one
222 * 235 *
223 * @param t The tiler to apply the strict rules to. 236 * @param t The tiler to apply the strict rules to.