Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_widget.c
Log Message:
* [Etk_Widget] Add the "width_request" and "height_request" properties back
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_widget.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- etk_widget.c 4 Aug 2006 18:46:26 -0000 1.61
+++ etk_widget.c 4 Aug 2006 20:05:55 -0000 1.62
@@ -74,6 +74,8 @@
ETK_WIDGET_THEME_GROUP_PROPERTY,
ETK_WIDGET_THEME_PARENT_PROPERTY,
ETK_WIDGET_GEOMETRY_PROPERTY,
+ ETK_WIDGET_WIDTH_REQUEST_PROPERTY,
+ ETK_WIDGET_HEIGHT_REQUEST_PROPERTY,
ETK_WIDGET_VISIBLE_PROPERTY,
ETK_WIDGET_VISIBILITY_LOCKED_PROPERTY,
ETK_WIDGET_REPEAT_MOUSE_EVENTS_PROPERTY,
@@ -250,6 +252,10 @@
ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_pointer(NULL));
etk_type_property_add(widget_type, "geometry",
ETK_WIDGET_GEOMETRY_PROPERTY,
ETK_PROPERTY_OTHER, ETK_PROPERTY_NO_ACCESS, NULL);
+ etk_type_property_add(widget_type, "width_request",
ETK_WIDGET_WIDTH_REQUEST_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(-1));
+ etk_type_property_add(widget_type, "height_request",
ETK_WIDGET_HEIGHT_REQUEST_PROPERTY,
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(-1));
etk_type_property_add(widget_type, "visible",
ETK_WIDGET_VISIBLE_PROPERTY,
ETK_PROPERTY_BOOL, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_bool(ETK_FALSE));
etk_type_property_add(widget_type, "visibility_locked",
ETK_WIDGET_VISIBILITY_LOCKED_PROPERTY,
@@ -892,6 +898,9 @@
widget->requested_size.w = w;
widget->requested_size.h = h;
+
+ etk_object_notify(ETK_OBJECT(widget), "width_request");
+ etk_object_notify(ETK_OBJECT(widget), "height_request");
etk_widget_size_recalc_queue(widget);
}
@@ -1982,6 +1991,12 @@
case ETK_WIDGET_VISIBILITY_LOCKED_PROPERTY:
etk_widget_visibility_locked_set(widget,
etk_property_value_bool_get(value));
break;
+ case ETK_WIDGET_WIDTH_REQUEST_PROPERTY:
+ etk_widget_size_request_set(widget,
etk_property_value_int_get(value), widget->requested_size.h);
+ break;
+ case ETK_WIDGET_HEIGHT_REQUEST_PROPERTY:
+ etk_widget_size_request_set(widget, widget->requested_size.w,
etk_property_value_int_get(value));
+ break;
case ETK_WIDGET_NAME_PROPERTY:
etk_widget_name_set(widget, etk_property_value_string_get(value));
break;
@@ -2032,6 +2047,12 @@
break;
case ETK_WIDGET_THEME_PARENT_PROPERTY:
etk_property_value_pointer_set(value, widget->theme_parent);
+ break;
+ case ETK_WIDGET_WIDTH_REQUEST_PROPERTY:
+ etk_property_value_int_set(value, widget->requested_size.w);
+ break;
+ case ETK_WIDGET_HEIGHT_REQUEST_PROPERTY:
+ etk_property_value_int_set(value, widget->requested_size.h);
break;
case ETK_WIDGET_VISIBLE_PROPERTY:
etk_property_value_bool_set(value, widget->visible);
-------------------------------------------------------------------------
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
