Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_button_stock.h ewl_entry.c ewl_media.h ewl_menu_base.c
ewl_menu_base.h ewl_menubar.h ewl_paned.h ewl_statusbar.h
ewl_tooltip.h
Log Message:
Additional theme keys listed.
Beginnings of menu keyboard handlers.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_button_stock.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- ewl_button_stock.h 28 Mar 2005 03:51:50 -0000 1.4
+++ ewl_button_stock.h 10 Apr 2005 05:05:17 -0000 1.5
@@ -11,6 +11,47 @@
* @{
*/
+/**
+ * @themekey /stock_ok/file
+ * @themekey /stock_ok/group
+ *
+ * @themekey /stock_apply/file
+ * @themekey /stock_apply/group
+ *
+ * @themekey /stock_cancel/file
+ * @themekey /stock_cancel/group
+ *
+ * @themekey /stock_open/file
+ * @themekey /stock_open/group
+ *
+ * @themekey /stock_pause/file
+ * @themekey /stock_pause/group
+ *
+ * @themekey /stock_play/file
+ * @themekey /stock_play/group
+ *
+ * @themekey /stock_save/file
+ * @themekey /stock_save/group
+ *
+ * @themekey /stock_stop/file
+ * @themekey /stock_stop/group
+ *
+ * @themekey /stock_rewind/file
+ * @themekey /stock_rewind/group
+ *
+ * @themekey /stock_fastforward/file
+ * @themekey /stock_fastforward/group
+ *
+ * @themekey /stock_quit/file
+ * @themekey /stock_quit/group
+ *
+ * @themekey /stock_arrow_up/file
+ * @themekey /stock_arrow_up/group
+ *
+ * @themekey /stock_home/file
+ * @themekey /stock_home/group
+ */
+
/* Stock Id */
#define EWL_STOCK_OK "stock_ok"
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_entry.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- ewl_entry.c 31 Mar 2005 02:25:40 -0000 1.11
+++ ewl_entry.c 10 Apr 2005 05:05:17 -0000 1.12
@@ -735,7 +735,6 @@
evas_object_textblock_char_pos_get(e->textobj, index, &tx, &ty,
&tw, &th);
- printf("char %d at %d, %d size %dx%d\n", index, tx, ty, tw, th);
if (x)
*x = (int)(tx + CURRENT_X(e));
if (y)
@@ -2081,6 +2080,10 @@
len = evas_object_textblock_length_get(e->textobj);
if (op->type == EWL_ENTRY_OP_TYPE_TEXT_SET) {
char *nf;
+ /*
+ * Get the initial formatting of the textblock
+ */
+ evas_object_textblock_cursor_pos_set(e->textobj, 1);
nf = ewl_entry_op_format_current_get(e);
evas_object_textblock_cursor_pos_set(e->textobj, 0);
evas_object_textblock_text_del(e->textobj, len);
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_media.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_media.h 9 Feb 2005 20:44:12 -0000 1.2
+++ ewl_media.h 10 Apr 2005 05:05:18 -0000 1.3
@@ -12,6 +12,11 @@
*/
/**
+ * @themekey /media/file
+ * @themekey /media/group
+ */
+
+/**
*/
typedef struct Ewl_Media Ewl_Media;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menu_base.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_menu_base.c 28 Mar 2005 07:04:28 -0000 1.2
+++ ewl_menu_base.c 10 Apr 2005 05:05:18 -0000 1.3
@@ -44,6 +44,8 @@
menu->popbox = ewl_vbox_new();
ewl_object_alignment_set(EWL_OBJECT(menu->popbox),
EWL_FLAG_ALIGN_LEFT | EWL_FLAG_ALIGN_TOP);
+ ewl_callback_append(menu->popbox, EWL_CALLBACK_KEY_DOWN,
+ ewl_menu_base_popbox_key_down_cb, NULL);
ewl_widget_show(menu->popbox);
/*
@@ -355,6 +357,7 @@
}
ewl_widget_show(menu->popup);
+ ewl_widget_focus_send(menu->popbox);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -363,13 +366,16 @@
ewl_menu_base_collapse_cb(Ewl_Widget * w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
- Ewl_Menu_Base *menu;
+ Ewl_Menu_Base *menu;
+ Ewl_Widget *focused;
DENTER_FUNCTION(DLEVEL_STABLE);
menu = EWL_MENU_BASE(w);
- ewl_widget_hide(menu->popup);
+ focused = ewl_widget_focused_get();
+ if (focused && !ewl_container_parent_of(menu->popbox, focused))
+ ewl_widget_hide(menu->popup);
DLEAVE_FUNCTION(DLEVEL_STABLE);
}
@@ -399,6 +405,29 @@
}
void
+ewl_menu_base_popbox_key_down_cb(Ewl_Widget *w, void *ev_data, void *user_data)
+{
+ Ewl_Event_Key_Down *ev = ev_data;
+ DENTER_FUNCTION(DLEVEL_STABLE);
+
+ printf("Menu item: %s\n", ev->keyname);
+ if (!strcmp(ev->keyname, "Down")) {
+ printf("Menu item down\n");
+ }
+ else if (!strcmp(ev->keyname, "Up")) {
+ printf("Menu item up\n");
+ }
+ else if (!strcmp(ev->keyname, "Left")) {
+ printf("Menu item collapse\n");
+ }
+ else if (!strcmp(ev->keyname, "Right")) {
+ printf("Menu item expand\n");
+ }
+
+ DLEAVE_FUNCTION(DLEVEL_STABLE);
+}
+
+void
ewl_menu_base_destroy_cb(Ewl_Widget * w, void *ev_data __UNUSED__,
void *user_data __UNUSED__)
{
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menu_base.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- ewl_menu_base.h 9 Feb 2005 20:44:12 -0000 1.2
+++ ewl_menu_base.h 10 Apr 2005 05:05:18 -0000 1.3
@@ -11,6 +11,14 @@
*/
/**
+ * @themekey /menuitem/file
+ * @themekey /menuitem/group
+ *
+ * @themekey /menu_base/file
+ * @themekey /menu_base/group
+ */
+
+/**
* This serves as a basis for all menu related entries. It provides the most
* basic layout facilities for items in a menu.
*/
@@ -108,6 +116,8 @@
void *user_data);
void ewl_menu_base_popup_hide_cb(Ewl_Widget * w, void *ev_data,
void *user_data);
+void ewl_menu_base_popbox_key_down_cb(Ewl_Widget * w, void *ev_data,
+ void *user_data);
/**
* @}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_menubar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_menubar.h 17 Feb 2005 19:14:55 -0000 1.3
+++ ewl_menubar.h 10 Apr 2005 05:05:18 -0000 1.4
@@ -10,6 +10,11 @@
*/
/**
+ * @themekey /menubar/file
+ * @themekey /menubar/group
+ */
+
+/**
*/
typedef struct Ewl_Menubar Ewl_Menubar;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_paned.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_paned.h 17 Feb 2005 19:14:55 -0000 1.3
+++ ewl_paned.h 10 Apr 2005 05:05:18 -0000 1.4
@@ -10,6 +10,11 @@
*/
/**
+ * @themekey /paned/file
+ * @themekey /paned/group
+ */
+
+/**
*/
typedef struct Ewl_Paned Ewl_Paned;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_statusbar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_statusbar.h 17 Feb 2005 19:14:56 -0000 1.3
+++ ewl_statusbar.h 10 Apr 2005 05:05:18 -0000 1.4
@@ -10,6 +10,11 @@
*/
/**
+ * @themekey /statusbar/file
+ * @themekey /statusbar/group
+ */
+
+/**
*/
typedef struct Ewl_Statusbar Ewl_Statusbar;
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_tooltip.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- ewl_tooltip.h 17 Feb 2005 19:14:56 -0000 1.3
+++ ewl_tooltip.h 10 Apr 2005 05:05:18 -0000 1.4
@@ -17,7 +17,8 @@
#define EWL_TOOLTIP(tt) ((Ewl_Tooltip *) tt)
#define EWL_TOOLTIP_OFFSET 15
-struct _ewl_tooltip {
+struct _ewl_tooltip
+{
Ewl_Box box; /**< the floating box container */
Ewl_Widget *text; /**< the text displaying in the tooltip */
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
