Enlightenment CVS committal

Author  : moom
Project : e17
Module  : proto

Dir     : e17/proto/etk/src/lib


Modified Files:
        etk_widget.c 


Log Message:
* [Etk_Widget] Recalculate the inner geometry each time the widget's 
smart-object is resized. It fixes a placement problem of the label of 
a tree's header in emphasis.


===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- etk_widget.c        29 Dec 2006 13:42:09 -0000      1.89
+++ etk_widget.c        31 Dec 2006 00:16:32 -0000      1.90
@@ -1759,7 +1759,8 @@
       return;
    
    /* free old data */
-   if(widget->dnd_types_num > 0 && widget->dnd_types != NULL)
+   if(num <= 0 || types == NULL || 
+     (widget->dnd_types_num > 0 && widget->dnd_types != NULL))
    {
       
       for(i = 0; i < widget->dnd_types_num; i++)
@@ -3231,16 +3232,18 @@
    if (!obj || !(widget = ETK_WIDGET(evas_object_smart_data_get(obj))))
       return;
 
-   if (w != widget->geometry.w || h != widget->geometry.h || 
widget->need_redraw)
+   if (1 || w != widget->geometry.w || h != widget->geometry.h || 
widget->need_redraw)
    {
       widget->geometry.w = w;
       widget->geometry.h = h;
       if (!widget->content_object)
       {
+         widget->inner_geometry.x = widget->geometry.x + widget->inset.left;
+         widget->inner_geometry.y = widget->geometry.y +  widget->inset.top;
          widget->inner_geometry.w = widget->geometry.w - widget->inset.left - 
widget->inset.right;
          widget->inner_geometry.h = widget->geometry.h - widget->inset.top - 
widget->inset.bottom;
       }
-
+      
       if (widget->theme_object)
       {
          evas_object_move(widget->theme_object, widget->geometry.x, 
widget->geometry.y);



-------------------------------------------------------------------------
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
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to