summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiscomfitor <michael.blumenkrantz@gmail.com>2013-09-01 14:18:14 +0100
committerdiscomfitor <michael.blumenkrantz@gmail.com>2013-09-01 14:18:14 +0100
commitdf5051e855a7243d823b108b66badb64fb3db41b (patch)
tree793240931e8463f46edab04192729db6f471381a
parented74c7338657e5ac36f26aaefb9767e8ca2d48b0 (diff)
fix chat layout, focus, timestamps
-rw-r--r--data/themes/chat_basic.edc2
-rw-r--r--src/modules/chat_basic.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/data/themes/chat_basic.edc b/data/themes/chat_basic.edc
index 6f963cc..d3b468a 100644
--- a/data/themes/chat_basic.edc
+++ b/data/themes/chat_basic.edc
@@ -12,7 +12,9 @@ collections {
12 } 12 }
13 part { name: "swallow.bar"; type: SWALLOW; 13 part { name: "swallow.bar"; type: SWALLOW;
14 description { state: "default"; 14 description { state: "default";
15 align: 0.5 0.0;
15 fixed: 0 1; 16 fixed: 0 1;
17 rel2.relative: 1 0;
16 } 18 }
17 } 19 }
18 part { name: "swallow.chat"; type: SWALLOW; 20 part { name: "swallow.chat"; type: SWALLOW;
diff --git a/src/modules/chat_basic.c b/src/modules/chat_basic.c
index 62bb749..ec6a57e 100644
--- a/src/modules/chat_basic.c
+++ b/src/modules/chat_basic.c
@@ -81,7 +81,7 @@ chat_insert(Evas_Object *win, Evas_Object *entry, const char *from, const char *
81 nlen = name ? strlen(name) : 0; 81 nlen = name ? strlen(name) : 0;
82 82
83 /* construct timestamp if requested by current theme */ 83 /* construct timestamp if requested by current theme */
84 ts = elm_layout_data_get(ly, "timestamp"); 84 ts = elm_layout_data_get(ly, "markup/header/timestamp");
85 if (ts) 85 if (ts)
86 len = strftime(timebuf, sizeof(timebuf), ts, 86 len = strftime(timebuf, sizeof(timebuf), ts,
87 localtime((time_t[]){ ecore_time_unix_get() })); 87 localtime((time_t[]){ ecore_time_unix_get() }));
@@ -242,6 +242,7 @@ chat_focus(Evas_Object *pane)
242 it = evas_object_data_get(pane, "toolbar_item"); 242 it = evas_object_data_get(pane, "toolbar_item");
243 if (it) //can be NULL if selected during creation */ 243 if (it) //can be NULL if selected during creation */
244 elm_toolbar_item_selected_set(it, 1); 244 elm_toolbar_item_selected_set(it, 1);
245 elm_object_focus_set(elm_object_part_content_get(pane, "elm.swallow.right"), 1);
245} 246}
246 247
247static void 248static void