Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_image.c
Log Message:
* [Etk_Image] Allow chaning the "stock-id" and the "stock-id" property,
even if the image is not in "STOCK" mode
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_image.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -3 -r1.28 -r1.29
--- etk_image.c 29 Dec 2006 22:10:13 -0000 1.28
+++ etk_image.c 30 Dec 2006 14:27:13 -0000 1.29
@@ -65,7 +65,7 @@
etk_type_property_add(image_type, "stock_id",
ETK_IMAGE_STOCK_ID_PROPERTY,
ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_STOCK_NO_STOCK));
etk_type_property_add(image_type, "stock_size",
ETK_IMAGE_STOCK_SIZE_PROPERTY,
- ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_STOCK_SMALL));
+ ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_STOCK_MEDIUM));
etk_type_property_add(image_type, "evas_object",
ETK_IMAGE_EVAS_OBJECT_PROPERTY,
ETK_PROPERTY_POINTER, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_pointer(NULL));
etk_type_property_add(image_type, "keep_aspect",
ETK_IMAGE_KEEP_ASPECT_PROPERTY,
@@ -310,7 +310,7 @@
if (stock_id)
*stock_id = ETK_STOCK_NO_STOCK;
if (stock_size)
- *stock_size = ETK_STOCK_SMALL;
+ *stock_size = ETK_STOCK_MEDIUM;
}
else
{
@@ -545,7 +545,7 @@
return;
image->keep_aspect = keep_aspect;
- etk_widget_size_recalc_queue(ETK_WIDGET(image));
+ etk_widget_redraw_queue(ETK_WIDGET(image));
etk_object_notify(ETK_OBJECT(image), "keep_aspect");
}
@@ -573,7 +573,7 @@
return;
image->aspect_ratio = aspect_ratio;
- etk_widget_size_recalc_queue(ETK_WIDGET(image));
+ etk_widget_redraw_queue(ETK_WIDGET(image));
etk_object_notify(ETK_OBJECT(image), "aspect_ratio");
}
@@ -667,10 +667,14 @@
case ETK_IMAGE_STOCK_ID_PROPERTY:
if (image->source == ETK_IMAGE_STOCK)
etk_image_set_from_stock(image, etk_property_value_int_get(value),
image->info.stock.size);
+ else
+ etk_image_set_from_stock(image, etk_property_value_int_get(value),
ETK_STOCK_MEDIUM);
break;
case ETK_IMAGE_STOCK_SIZE_PROPERTY:
if (image->source == ETK_IMAGE_STOCK)
etk_image_set_from_stock(image, image->info.stock.id,
etk_property_value_int_get(value));
+ else
+ etk_image_set_from_stock(image, ETK_STOCK_NO_STOCK,
etk_property_value_int_get(value));
break;
case ETK_IMAGE_EVAS_OBJECT_PROPERTY:
etk_image_set_from_evas_object(image,
etk_property_value_pointer_get(value));
@@ -716,10 +720,16 @@
etk_property_value_string_set(value, NULL);
break;
case ETK_IMAGE_STOCK_ID_PROPERTY:
- etk_property_value_int_set(value, image->info.stock.id);
+ if (image->source == ETK_IMAGE_STOCK)
+ etk_property_value_int_set(value, image->info.stock.id);
+ else
+ etk_property_value_int_set(value, ETK_STOCK_NO_STOCK);
break;
case ETK_IMAGE_STOCK_SIZE_PROPERTY:
- etk_property_value_int_set(value, image->info.stock.size);
+ if (image->source == ETK_IMAGE_STOCK)
+ etk_property_value_int_set(value, image->info.stock.size);
+ else
+ etk_property_value_int_set(value, ETK_STOCK_MEDIUM);
break;
case ETK_IMAGE_EVAS_OBJECT_PROPERTY:
etk_property_value_pointer_set(value, image->object);
@@ -853,7 +863,7 @@
break;
case ETK_IMAGE_STOCK:
image->info.stock.id = ETK_STOCK_NO_STOCK;
- image->info.stock.size = ETK_STOCK_SMALL;
+ image->info.stock.size = ETK_STOCK_MEDIUM;
break;
case ETK_IMAGE_DATA:
image->info.data.size.w = 0;
@@ -1013,5 +1023,5 @@
* Set to a random value if the image is not loaded from a stock icon
* @prop_type Integer
* @prop_rw
- * @prop_val ETK_STOCK_SMALL
+ * @prop_val ETK_STOCK_MEDIUM
*/
-------------------------------------------------------------------------
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
