aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/extantz/chat.c
diff options
context:
space:
mode:
authorDavid Walter Seikel2014-05-03 18:33:58 +1000
committerDavid Walter Seikel2014-05-03 18:33:58 +1000
commit3c0fb329ecc4a719bd8d80257298d08f80b1bfd3 (patch)
treea0bb12ea6772588b90b0d26c855aeb802b6e56c3 /src/extantz/chat.c
parentRemove Evas_3d example stuff from GuiLua, now that it's in extantz. (diff)
downloadSledjHamr-3c0fb329ecc4a719bd8d80257298d08f80b1bfd3.zip
SledjHamr-3c0fb329ecc4a719bd8d80257298d08f80b1bfd3.tar.gz
SledjHamr-3c0fb329ecc4a719bd8d80257298d08f80b1bfd3.tar.bz2
SledjHamr-3c0fb329ecc4a719bd8d80257298d08f80b1bfd3.tar.xz
Move non GL_View stuff from gld -> ourGlobals. Plus some white space fixes.
Diffstat (limited to '')
-rw-r--r--src/extantz/chat.c80
1 files changed, 40 insertions, 40 deletions
diff --git a/src/extantz/chat.c b/src/extantz/chat.c
index e8a0c4d..12f4d20 100644
--- a/src/extantz/chat.c
+++ b/src/extantz/chat.c
@@ -1,47 +1,47 @@
1#include "extantz.h" 1#include "extantz.h"
2 2
3 3
4void chat_add(GLData *gld) 4void chat_add(globals *ourGlobals)
5{ 5{
6 Evas_Object *win, *bx, *en; 6 Evas_Object *win, *bx, *en;
7 7
8 win = fang_win_add(gld); 8 win = fang_win_add(ourGlobals);
9 9
10 bx = eo_add(ELM_OBJ_BOX_CLASS, win); 10 bx = eo_add(ELM_OBJ_BOX_CLASS, win);
11 eo_do(bx, 11 eo_do(bx,
12 evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 12 evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
13 evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL) 13 evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL)
14 ); 14 );
15 elm_win_resize_object_add(win, bx); 15 elm_win_resize_object_add(win, bx);
16 16
17 en = eo_add(ELM_OBJ_ENTRY_CLASS, win); 17 en = eo_add(ELM_OBJ_ENTRY_CLASS, win);
18 elm_object_text_set(en, "History is shown here"); 18 elm_object_text_set(en, "History is shown here");
19 eo_do(en, 19 eo_do(en,
20 elm_obj_entry_scrollable_set(EINA_TRUE), 20 elm_obj_entry_scrollable_set(EINA_TRUE),
21 elm_obj_entry_editable_set(EINA_FALSE), 21 elm_obj_entry_editable_set(EINA_FALSE),
22 evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 22 evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
23 evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), 23 evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
24 evas_obj_visibility_set(EINA_TRUE) 24 evas_obj_visibility_set(EINA_TRUE)
25 ); 25 );
26 elm_box_pack_end(bx, en); 26 elm_box_pack_end(bx, en);
27 eo_unref(en); 27 eo_unref(en);
28 28
29 en = eo_add(ELM_OBJ_ENTRY_CLASS, win); 29 en = eo_add(ELM_OBJ_ENTRY_CLASS, win);
30 elm_object_text_set(en, ""); 30 elm_object_text_set(en, "");
31 eo_do(en, 31 eo_do(en,
32 elm_obj_entry_scrollable_set(EINA_TRUE), 32 elm_obj_entry_scrollable_set(EINA_TRUE),
33// TODO - Setting editable to TRUE is what hangs up extantz on exit. 33// TODO - Setting editable to TRUE is what hangs up extantz on exit.
34// elm_obj_entry_editable_set(EINA_TRUE), 34// elm_obj_entry_editable_set(EINA_TRUE),
35 elm_obj_entry_editable_set(EINA_FALSE), 35 elm_obj_entry_editable_set(EINA_FALSE),
36 evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND), 36 evas_obj_size_hint_weight_set(EVAS_HINT_EXPAND, EVAS_HINT_EXPAND),
37 evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL), 37 evas_obj_size_hint_align_set(EVAS_HINT_FILL, EVAS_HINT_FILL),
38 evas_obj_visibility_set(EINA_TRUE) 38 evas_obj_visibility_set(EINA_TRUE)
39 ); 39 );
40 elm_box_pack_end(bx, en); 40 elm_box_pack_end(bx, en);
41 eo_unref(en); 41 eo_unref(en);
42 42
43 evas_object_show(bx); 43 evas_object_show(bx);
44 eo_unref(bx); 44 eo_unref(bx);
45 45
46 fang_win_complete(gld, win, 30, 500, gld->win_w / 3, gld->win_h / 3); 46 fang_win_complete(ourGlobals, win, 30, 500, ourGlobals->win_w / 3, ourGlobals->win_h / 3);
47} 47}