diff options
author | David Walter Seikel | 2014-05-12 04:35:32 +1000 |
---|---|---|
committer | David Walter Seikel | 2014-05-12 04:35:32 +1000 |
commit | 4a180d988d36ee6a7d8a1d4e106b801410a2a05c (patch) | |
tree | 90caec7339191be5dd0d25f3bea0f403f6d0f10e /src/libraries/winFang.c | |
parent | Internal and external windows now both use the layout. (diff) | |
download | SledjHamr-4a180d988d36ee6a7d8a1d4e106b801410a2a05c.zip SledjHamr-4a180d988d36ee6a7d8a1d4e106b801410a2a05c.tar.gz SledjHamr-4a180d988d36ee6a7d8a1d4e106b801410a2a05c.tar.bz2 SledjHamr-4a180d988d36ee6a7d8a1d4e106b801410a2a05c.tar.xz |
Fiddle with the winFang title, and white space cleanups on winFang.edc.
Diffstat (limited to '')
-rw-r--r-- | src/libraries/winFang.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/libraries/winFang.c b/src/libraries/winFang.c index e2dce45..0d1137f 100644 --- a/src/libraries/winFang.c +++ b/src/libraries/winFang.c | |||
@@ -185,6 +185,8 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
185 | { | 185 | { |
186 | eina_clist_add_head(&parent->winFangs, &result->node); | 186 | eina_clist_add_head(&parent->winFangs, &result->node); |
187 | obj = parent->win; | 187 | obj = parent->win; |
188 | h += 15; | ||
189 | result->h = h; | ||
188 | } | 190 | } |
189 | else | 191 | else |
190 | { | 192 | { |
@@ -199,7 +201,7 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
199 | 201 | ||
200 | snprintf(buf, sizeof(buf), "%s/winFang.edj", elm_app_data_dir_get()); | 202 | snprintf(buf, sizeof(buf), "%s/winFang.edj", elm_app_data_dir_get()); |
201 | result->layout = eo_add(ELM_OBJ_LAYOUT_CLASS, obj, | 203 | result->layout = eo_add(ELM_OBJ_LAYOUT_CLASS, obj, |
202 | evas_obj_size_set(result->w, result->h), | 204 | evas_obj_size_set(w, h), |
203 | evas_obj_position_set(x, y), | 205 | evas_obj_position_set(x, y), |
204 | evas_obj_name_set(WF_LAYOUT), | 206 | evas_obj_name_set(WF_LAYOUT), |
205 | elm_obj_layout_file_set(buf, WF_LAYOUT), | 207 | elm_obj_layout_file_set(buf, WF_LAYOUT), |
@@ -211,7 +213,8 @@ winFang *winFangAdd(winFang *parent, int x, int y, int w, int h, char *title, ch | |||
211 | 213 | ||
212 | if (result->parent) | 214 | if (result->parent) |
213 | { | 215 | { |
214 | result->win = result->layout; | 216 | result->win = result->layout; |
217 | elm_layout_signal_emit(result->layout, "isInternal", "isInternal"); | ||
215 | 218 | ||
216 | // Something to catch clicks on the background, for moving the window. | 219 | // Something to catch clicks on the background, for moving the window. |
217 | // Coz Elm is uncooperative with this sort of thing, so we need to stick in a rectangle. | 220 | // Coz Elm is uncooperative with this sort of thing, so we need to stick in a rectangle. |
@@ -246,9 +249,6 @@ result->win = result->layout; | |||
246 | eo_unref(result->hand[i]); | 249 | eo_unref(result->hand[i]); |
247 | } | 250 | } |
248 | 251 | ||
249 | if (title) | ||
250 | elm_object_part_text_set(result->layout, WF_TITLE, title); | ||
251 | /* | ||
252 | result->title = eo_add(ELM_OBJ_LABEL_CLASS, result->layout, | 252 | result->title = eo_add(ELM_OBJ_LABEL_CLASS, result->layout, |
253 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, 1.0), | 253 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, 1.0), |
254 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), | 254 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), |
@@ -257,20 +257,8 @@ result->win = result->layout; | |||
257 | elm_object_style_set(result->title, "slide_bounce"); | 257 | elm_object_style_set(result->title, "slide_bounce"); |
258 | snprintf(buf, PATH_MAX, "<b>%s</b>", title); | 258 | snprintf(buf, PATH_MAX, "<b>%s</b>", title); |
259 | elm_object_text_set(result->title, buf); | 259 | elm_object_text_set(result->title, buf); |
260 | elm_box_pack_end(result->box, result->title); | 260 | elm_object_part_content_set(result->layout, WF_TITLE, result->title); |
261 | eo_unref(result->title); | 261 | eo_unref(result->title); |
262 | */ | ||
263 | |||
264 | /* | ||
265 | obj1 = eo_add(ELM_OBJ_SEPARATOR_CLASS, result->layout, | ||
266 | evas_obj_size_hint_align_set(EVAS_HINT_FILL, 1.0), | ||
267 | evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, 0.0), | ||
268 | elm_obj_separator_horizontal_set(EINA_TRUE), | ||
269 | evas_obj_visibility_set(EINA_TRUE) | ||
270 | ); | ||
271 | elm_box_pack_end(result->box, obj1); | ||
272 | eo_unref(obj1); | ||
273 | */ | ||
274 | } | 262 | } |
275 | 263 | ||
276 | result->grid = eo_add(ELM_OBJ_GRID_CLASS, result->layout, | 264 | result->grid = eo_add(ELM_OBJ_GRID_CLASS, result->layout, |