Enlightenment CVS committal
Author : dj2
Project : misc
Module : eke
Dir : misc/eke/src
Modified Files:
Eke.h eke_gui_edje.c
Log Message:
- hook up the refresh menu option
- minor bit of re-formatting
- There seems to be a problem with the layering of the menu and the list of
feeds in the left column that I can't figure out...
===================================================================
RCS file: /cvsroot/enlightenment/misc/eke/src/Eke.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- Eke.h 31 Dec 2004 05:17:53 -0000 1.3
+++ Eke.h 5 Jan 2005 04:38:56 -0000 1.4
@@ -15,6 +15,8 @@
#include <Ewl.h>
#endif
+#include "eke_feed.h"
+
typedef enum Eke_Gui_Type Eke_Gui_Type;
enum Eke_Gui_Type {
#if BUILD_EWL_GUI
@@ -51,6 +53,7 @@
#endif
} gui;
+ Eke_Feed *current_feed;
Ecore_Hash *feeds;
};
===================================================================
RCS file: /cvsroot/enlightenment/misc/eke/src/eke_gui_edje.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- eke_gui_edje.c 5 Jan 2005 03:31:14 -0000 1.11
+++ eke_gui_edje.c 5 Jan 2005 04:38:56 -0000 1.12
@@ -137,8 +137,7 @@
Evas_Object *list;
disp->menu_item = edje_object_add(evas);
- if(edje_object_file_set(disp->menu_item, file, "feed.list.item"))
- {
+ if (edje_object_file_set(disp->menu_item, file, "feed.list.item")) {
edje_object_size_min_get(disp->menu_item, &w, &h);
if ((w > 0) && (h > 0))
evas_object_resize(disp->menu_item, w, h);
@@ -147,9 +146,10 @@
edje_object_signal_callback_add(disp->menu_item,
"eke,feed,select", "",
eke_gui_edje_feed_select_cb, eke);
- if((list = evas_object_name_find(evas, "feeds.list"))) {
+
+ if ((list = evas_object_name_find(evas, "feeds.list")))
esmart_container_element_append(list, disp->menu_item);
- }
+
evas_object_show(disp->menu_item);
} else {
evas_object_del(disp->menu_item);
@@ -177,7 +177,7 @@
ecore_list_goto_first(feed->items);
edje_object_file_get(eke->gui.edje.edje, &file, NULL);
while ((item = ecore_list_next(feed->items)) != NULL) {
- if((obj = eke_gui_edje_item_new(evas, eke->gui.edje.theme,
"feed.body.item"))) {
+ if ((obj = eke_gui_edje_item_new(evas, eke->gui.edje.theme,
"feed.body.item"))) {
eke_gui_edje_item_init(obj, item->title, item->date, item->link,
item->desc);
eke_gui_edje_item_size_min_get(obj, &w, &h);
if ((w > 0) && (h > 0))
@@ -217,6 +217,8 @@
"feed.body.scroll",
eke_gui_edje_feed_container_scroll_cb,
disp->body);
+
+ eke->current_feed = feed;
}
void
@@ -299,10 +301,13 @@
eke_gui_edje_feed_refresh_cb(void *data, Evas_Object *obj,
const char *em, const char *src)
{
- printf("refresh cb\n");
+ Eke *eke;
+
+ eke = data;
+ if (eke->current_feed)
+ eke_feed_update_execute(eke->current_feed);
return;
- data = NULL;
obj = NULL;
em = NULL;
src = NULL;
@@ -315,10 +320,9 @@
Eke *eke = NULL;
Eke_Feed *feed = NULL;
- if((eke = (Eke*)data)) {
- if((feed = evas_object_data_get(o, "feed"))) {
+ if ((eke = (Eke*)data)) {
+ if ((feed = evas_object_data_get(o, "feed")))
eke_gui_edje_feed_swap(eke, feed);
- }
}
return;
@@ -335,24 +339,21 @@
Evas_Object *container = NULL;
Evas_Coord cw = (Evas_Coord)0.0, ch = (Evas_Coord)0.0;
- if((container = (Evas_Object*)data)) {
-
+ if ((container = (Evas_Object*)data)) {
edje_object_part_geometry_get(o, "feed.body", NULL, NULL, &cw, &ch);
container_length = esmart_container_elements_length_get(container);
edje_object_part_drag_value_get(o, src, &sx, &sy);
- switch (esmart_container_direction_get(container))
- {
+
+ switch (esmart_container_direction_get(container)) {
case CONTAINER_DIRECTION_HORIZONTAL:
- if(container_length > cw)
- {
+ if(container_length > cw) {
container_length -= cw;
esmart_container_scroll_offset_set(container,
- (int) (sx * container_length));
}
break;
case CONTAINER_DIRECTION_VERTICAL:
- if(container_length > ch)
- {
+ if(container_length > ch) {
container_length -= ch;
esmart_container_scroll_offset_set(container,
- (int) (sy * container_length));
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
