Enlightenment CVS committal
Author : rbdpngn
Project : e17
Module : libs/ewl
Dir : e17/libs/ewl/src/lib
Modified Files:
ewl_embed.c ewl_entry.c ewl_enums.h ewl_widget.c
Log Message:
Change state names to match their corresponding events.
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_embed.c 2 Dec 2005 20:09:57 -0000 1.28
+++ ewl_embed.c 2 Dec 2005 21:07:39 -0000 1.29
@@ -263,7 +263,7 @@
if (e && e->last.clicked)
{
ewl_object_state_remove(EWL_OBJECT(e->last.clicked),
- EWL_FLAG_STATE_SELECTED);
+ EWL_FLAG_STATE_FOCUSED);
ewl_callback_call(e->last.clicked, EWL_CALLBACK_FOCUS_OUT);
e->last.clicked = NULL;
@@ -522,14 +522,14 @@
if (widget != deselect) {
if (deselect) {
ewl_object_state_remove(EWL_OBJECT(deselect),
- EWL_FLAG_STATE_SELECTED);
+ EWL_FLAG_STATE_FOCUSED);
ewl_callback_call(deselect, EWL_CALLBACK_FOCUS_OUT);
}
if (widget && !(ewl_object_state_has(EWL_OBJECT(widget),
EWL_FLAG_STATE_DISABLED))) {
ewl_object_state_add(EWL_OBJECT(widget),
- EWL_FLAG_STATE_SELECTED);
+ EWL_FLAG_STATE_FOCUSED);
ewl_callback_call(widget, EWL_CALLBACK_FOCUS_IN);
}
}
@@ -629,7 +629,7 @@
while (embed->last.mouse_in && (widget != embed->last.mouse_in)
&&
!ewl_container_parent_of(embed->last.mouse_in, widget)) {
ewl_object_state_remove(EWL_OBJECT(embed->last.mouse_in),
- EWL_FLAG_STATE_HILITED);
+ EWL_FLAG_STATE_MOUSE_IN);
ewl_callback_call(embed->last.mouse_in,
EWL_CALLBACK_MOUSE_OUT);
embed->last.mouse_in = embed->last.mouse_in->parent;
}
@@ -650,9 +650,9 @@
* First mouse move event in a widget marks it focused.
*/
if
(!(ewl_object_state_has(EWL_OBJECT(embed->last.mouse_in),
- EWL_FLAG_STATE_HILITED))) {
+ EWL_FLAG_STATE_MOUSE_IN))) {
ewl_object_state_add(EWL_OBJECT(embed->last.mouse_in),
- EWL_FLAG_STATE_HILITED);
+ EWL_FLAG_STATE_MOUSE_IN);
ewl_callback_call_with_event_data(embed->last.mouse_in,
EWL_CALLBACK_MOUSE_IN, &ev);
}
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_entry.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -3 -r1.43 -r1.44
--- ewl_entry.c 2 Dec 2005 20:09:57 -0000 1.43
+++ ewl_entry.c 2 Dec 2005 21:07:39 -0000 1.44
@@ -139,7 +139,7 @@
ewl_callback_append(EWL_WIDGET(e), EWL_CALLBACK_KEY_DOWN,
ewl_entry_cb_key_down, NULL);
- if (ewl_object_state_has(EWL_OBJECT(e),
EWL_FLAG_STATE_SELECTED))
+ if (ewl_object_state_has(EWL_OBJECT(e), EWL_FLAG_STATE_FOCUSED))
ewl_widget_show(e->cursor);
ewl_widget_state_set(EWL_WIDGET(e), "editable");
@@ -149,7 +149,7 @@
ewl_callback_del(EWL_WIDGET(e), EWL_CALLBACK_KEY_DOWN,
ewl_entry_cb_key_down);
- if (ewl_object_state_has(EWL_OBJECT(e),
EWL_FLAG_STATE_SELECTED))
+ if (ewl_object_state_has(EWL_OBJECT(e), EWL_FLAG_STATE_FOCUSED))
ewl_widget_hide(e->cursor);
ewl_widget_state_set(EWL_WIDGET(e), "noteditable");
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- ewl_enums.h 2 Dec 2005 20:16:46 -0000 1.28
+++ ewl_enums.h 2 Dec 2005 21:07:39 -0000 1.29
@@ -147,9 +147,9 @@
* been clicked, does it have the keyboard focus, etc.
*/
EWL_FLAG_STATE_NORMAL = 0,
- EWL_FLAG_STATE_HILITED = 0x800000,
+ EWL_FLAG_STATE_MOUSE_IN = 0x800000,
EWL_FLAG_STATE_PRESSED = 0x1000000,
- EWL_FLAG_STATE_SELECTED = 0x20000000,
+ EWL_FLAG_STATE_FOCUSED = 0x20000000,
EWL_FLAG_STATE_DND = 0x4000000,
EWL_FLAG_STATE_DISABLED = 0x8000000,
@@ -179,8 +179,8 @@
EWL_FLAG_QUEUED_DPROCESS)
#define EWL_FLAGS_STATE_MASK (EWL_FLAG_STATE_NORMAL | \
- EWL_FLAG_STATE_HILITED | EWL_FLAG_STATE_PRESSED | \
- EWL_FLAG_STATE_SELECTED | EWL_FLAG_STATE_DND | \
+ EWL_FLAG_STATE_MOUSE_IN | EWL_FLAG_STATE_PRESSED | \
+ EWL_FLAG_STATE_FOCUSED | EWL_FLAG_STATE_DND | \
EWL_FLAG_STATE_DISABLED)
/**
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -3 -r1.47 -r1.48
--- ewl_widget.c 2 Dec 2005 19:53:44 -0000 1.47
+++ ewl_widget.c 2 Dec 2005 21:07:39 -0000 1.48
@@ -2255,7 +2255,7 @@
snprintf(state, 14, "mouse,up,%i", e->button);
ewl_widget_state_set(w, state);
- if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_HILITED)) {
+ if (ewl_object_state_has(EWL_OBJECT(w), EWL_FLAG_STATE_MOUSE_IN)) {
int x, y;
ewl_widget_state_set(w, "mouse,in");
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
