Enlightenment CVS committal

Author  : ningerso
Project : e17
Module  : libs/ewl

Dir     : e17/libs/ewl/src/lib


Modified Files:
        ewl_dnd.c ewl_embed.c ewl_enums.h ewl_widget.c 


Log Message:
More consistent name spacing for DND properties on widgets.
Fix realize/unrealize bug on tooltips.

===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_dnd.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- ewl_dnd.c   8 Sep 2006 07:12:43 -0000       1.24
+++ ewl_dnd.c   26 Sep 2006 18:04:44 -0000      1.25
@@ -138,12 +138,15 @@
        if (types && *types) {
                type = ewl_dnd_types_encode(types);
                ecore_hash_set(ewl_dnd_provided_hash, w, type);
-               ewl_object_flags_add(EWL_OBJECT(w), EWL_FLAG_PROPERTY_DRAGGABLE,
+               ewl_object_flags_add(EWL_OBJECT(w),
+                               EWL_FLAG_PROPERTY_DND_SOURCE,
                                EWL_FLAGS_PROPERTY_MASK);
        }
        else {
+               type = ecore_hash_remove(ewl_dnd_provided_hash, w);
+               IF_FREE(type);
                ewl_object_flags_remove(EWL_OBJECT(w),
-                               EWL_FLAG_PROPERTY_DRAGGABLE,
+                               EWL_FLAG_PROPERTY_DND_SOURCE,
                                EWL_FLAGS_PROPERTY_MASK);
        }
 
@@ -212,7 +215,8 @@
        if (types && *types) {
                type = ewl_dnd_types_encode(types);
                ecore_hash_set(ewl_dnd_accepted_hash, w, type);
-               ewl_object_flags_add(EWL_OBJECT(w), EWL_FLAG_PROPERTY_DND_AWARE,
+               ewl_object_flags_add(EWL_OBJECT(w),
+                               EWL_FLAG_PROPERTY_DND_TARGET,
                                EWL_FLAGS_PROPERTY_MASK);
                if (REALIZED(w) && !OBSCURED(w)) {
                        Ewl_Embed *emb;
@@ -223,7 +227,7 @@
        }
        else {
                ewl_object_flags_remove(EWL_OBJECT(w),
-                               EWL_FLAG_PROPERTY_DND_AWARE,
+                               EWL_FLAG_PROPERTY_DND_TARGET,
                                EWL_FLAGS_PROPERTY_MASK);
                if (REALIZED(w) && !OBSCURED(w)) {
                        Ewl_Embed *emb;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_embed.c,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -3 -r1.81 -r1.82
--- ewl_embed.c 9 Sep 2006 05:04:42 -0000       1.81
+++ ewl_embed.c 26 Sep 2006 18:04:44 -0000      1.82
@@ -712,7 +712,7 @@
         */ 
        while (widget) {
                if (ewl_object_flags_has(EWL_OBJECT(widget),
-                                       EWL_FLAG_PROPERTY_DND_AWARE,
+                                       EWL_FLAG_PROPERTY_DND_TARGET,
                                        EWL_FLAGS_PROPERTY_MASK))
                        break;
                widget = widget->parent;
@@ -803,7 +803,7 @@
         */ 
        while (widget) {
                if (ewl_object_flags_has(EWL_OBJECT(widget),
-                                       EWL_FLAG_PROPERTY_DND_AWARE,
+                                       EWL_FLAG_PROPERTY_DND_TARGET,
                                        EWL_FLAGS_PROPERTY_MASK))
                        break;
                widget = widget->parent;
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_enums.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- ewl_enums.h 6 Sep 2006 17:47:45 -0000       1.54
+++ ewl_enums.h 26 Sep 2006 18:04:44 -0000      1.55
@@ -157,8 +157,8 @@
        EWL_FLAG_STATE_DND = 0x8000000,         /**< Widget is engaged in DND */
        EWL_FLAG_STATE_DISABLED = 0x10000000,   /**< Widget is disabled */
 
-       EWL_FLAG_PROPERTY_DND_AWARE     = 0x20000000,   /**< Widget is DND 
aware */
-       EWL_FLAG_PROPERTY_DRAGGABLE     = 0x40000000,   /**< Widget is dragable 
*/
+       EWL_FLAG_PROPERTY_DND_TARGET    = 0x20000000,   /**< Widget is DND 
aware */
+       EWL_FLAG_PROPERTY_DND_SOURCE    = 0x40000000,   /**< Widget is dragable 
*/
        EWL_FLAG_STATE_DND_WAIT         = 0x80000000,   /**< Widget is in DND 
wait state */
 };
 
@@ -198,7 +198,7 @@
 #define EWL_FLAGS_PROPERTY_MASK (EWL_FLAG_PROPERTY_RECURSIVE | \
                EWL_FLAG_PROPERTY_TOPLEVEL | EWL_FLAG_PROPERTY_INTERNAL | \
                EWL_FLAG_PROPERTY_BLOCK_TAB_FOCUS | EWL_FLAG_PROPERTY_FOCUSABLE 
| \
-               EWL_FLAG_PROPERTY_DND_AWARE | EWL_FLAG_PROPERTY_DRAGGABLE | \
+               EWL_FLAG_PROPERTY_DND_TARGET | EWL_FLAG_PROPERTY_DND_SOURCE | \
                EWL_FLAG_PROPERTY_IN_TAB_LIST)
 
 /**
===================================================================
RCS file: /cvs/e/e17/libs/ewl/src/lib/ewl_widget.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -3 -r1.100 -r1.101
--- ewl_widget.c        15 Sep 2006 17:53:34 -0000      1.100
+++ ewl_widget.c        26 Sep 2006 18:04:44 -0000      1.101
@@ -250,7 +250,7 @@
         * Notify parent of hidden state.
         */
        pc = EWL_CONTAINER(w->parent);
-       if (pc)
+       if (pc && VISIBLE(w))
                ewl_container_child_hide_call(pc, w);
 
        ewl_callback_call(w, EWL_CALLBACK_UNREALIZE);
@@ -2215,7 +2215,7 @@
        /*
         * Increment the dnd awareness counter on the embed.
         */
-       if (ewl_object_flags_has(EWL_OBJECT(w), EWL_FLAG_PROPERTY_DND_AWARE,
+       if (ewl_object_flags_has(EWL_OBJECT(w), EWL_FLAG_PROPERTY_DND_TARGET,
                                EWL_FLAGS_PROPERTY_MASK))
                ewl_embed_dnd_aware_set(emb);
 
@@ -2393,7 +2393,7 @@
        /*
         * Decrement the dnd awareness counter on the embed.
         */
-       if (ewl_object_flags_has(EWL_OBJECT(w), EWL_FLAG_PROPERTY_DND_AWARE,
+       if (ewl_object_flags_has(EWL_OBJECT(w), EWL_FLAG_PROPERTY_DND_TARGET,
                                EWL_FLAGS_PROPERTY_MASK))
                ewl_embed_dnd_aware_remove(emb);
 
@@ -3017,7 +3017,7 @@
        {
                ewl_object_flags_add(EWL_OBJECT(w), EWL_FLAG_STATE_DND_WAIT, 
                                                        EWL_FLAGS_STATE_MASK);
-               ewl_widget_dnd_drag_move_count=0;               
+               ewl_widget_dnd_drag_move_count = 0;             
                ewl_widget_drag_widget = w;
        }
 
@@ -3040,14 +3040,14 @@
 
        if (!ewl_dnd_status_get())
                DRETURN(DLEVEL_STABLE);
-       
+
        if (ewl_widget_drag_widget 
                        && 
ewl_object_flags_has(EWL_OBJECT(ewl_widget_drag_widget), 
                                                EWL_FLAG_STATE_DND_WAIT, 
                                                EWL_FLAGS_STATE_MASK)) 
        {
                ewl_widget_dnd_drag_move_count++;
-               
+
                if (ewl_widget_dnd_drag_move_count > 2) 
                {
                        
ewl_object_flags_remove(EWL_OBJECT(ewl_widget_drag_widget), 
@@ -3056,7 +3056,7 @@
                        
ewl_object_flags_add(EWL_OBJECT(ewl_widget_drag_widget), 
                                                EWL_FLAG_STATE_DND,
                                                EWL_FLAGS_STATE_MASK);
-               
+
                        ewl_dnd_drag_start(ewl_widget_drag_widget);     
                }
        }
@@ -3106,11 +3106,11 @@
 
        if (val) { 
                if (!ewl_object_flags_has(EWL_OBJECT(w), 
-                                       EWL_FLAG_PROPERTY_DRAGGABLE, 
+                                       EWL_FLAG_PROPERTY_DND_SOURCE, 
                                        EWL_FLAGS_PROPERTY_MASK)) 
                {
                        ewl_object_flags_add(EWL_OBJECT(w), 
-                                               EWL_FLAG_PROPERTY_DRAGGABLE, 
+                                               EWL_FLAG_PROPERTY_DND_SOURCE, 
                                                EWL_FLAGS_PROPERTY_MASK );
 
                        ewl_callback_append(w, EWL_CALLBACK_MOUSE_DOWN, 
@@ -3128,7 +3128,7 @@
        else 
        {
                if (ewl_object_flags_has(EWL_OBJECT(w), 
-                                               EWL_FLAG_PROPERTY_DRAGGABLE, 
+                                               EWL_FLAG_PROPERTY_DND_SOURCE, 
                                                EWL_FLAGS_PROPERTY_MASK)) 
                {
                        ewl_callback_del(w, EWL_CALLBACK_MOUSE_DOWN, 
@@ -3139,7 +3139,7 @@
                                                ewl_widget_drag_up_cb);
 
                        ewl_object_flags_remove(EWL_OBJECT(w), 
-                                               EWL_FLAG_PROPERTY_DRAGGABLE,  
+                                               EWL_FLAG_PROPERTY_DND_SOURCE,  
                                                EWL_FLAGS_PROPERTY_MASK);
 
                }



-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to