Enlightenment CVS committal
Author : lok
Project : e17
Module : proto
Dir : e17/proto/etk/src/lib
Modified Files:
etk_button.c etk_toolbar.c etk_toolbar.h
Log Message:
[Etk_Button] Only the button's image is changed on etk_button_stock_size_set
The button's label wasn't centered horizontaly
[Etk_Toolbar] stock_size propertie added
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_button.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -3 -r1.26 -r1.27
--- etk_button.c 16 Aug 2006 22:04:29 -0000 1.26
+++ etk_button.c 20 Aug 2006 17:49:20 -0000 1.27
@@ -375,7 +375,7 @@
if (stock_id == ETK_STOCK_NO_STOCK)
return;
- etk_button_set_from_stock(ETK_BUTTON(button), stock_id);
+ etk_image_set_from_stock(button->image, stock_id, size);
etk_object_notify(ETK_OBJECT(button), "stock_size");
}
@@ -662,7 +662,7 @@
etk_container_add(ETK_CONTAINER(button->alignment), button->box);
etk_signal_connect("child_removed", ETK_OBJECT(button->box),
ETK_CALLBACK(_etk_button_image_removed_cb), button);
- etk_label_alignment_set(ETK_LABEL(button->label), 0.0, 0.5);
+ etk_label_alignment_set(ETK_LABEL(button->label), 0.5, 0.5);
etk_box_append(ETK_BOX(button->box), button->label, ETK_BOX_END,
ETK_BOX_NONE, 0);
if (button->style == ETK_BUTTON_ICON)
etk_widget_hide(button->label);
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toolbar.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- etk_toolbar.c 16 Aug 2006 06:05:53 -0000 1.5
+++ etk_toolbar.c 20 Aug 2006 17:49:20 -0000 1.6
@@ -16,7 +16,8 @@
enum Etk_Window_Property_Id
{
ETK_TOOLBAR_ORIENTATION_PROPERTY,
- ETK_TOOLBAR_STYLE_PROPERTY
+ ETK_TOOLBAR_STYLE_PROPERTY,
+ ETK_TOOLBAR_STOCK_SIZE_PROPERTY
};
static void _etk_toolbar_constructor(Etk_Toolbar *toolbar);
@@ -47,6 +48,7 @@
etk_type_property_add(toolbar_type, "orientation",
ETK_TOOLBAR_ORIENTATION_PROPERTY, ETK_PROPERTY_INT,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_TOOLBAR_HORIZ));
etk_type_property_add(toolbar_type, "style", ETK_TOOLBAR_STYLE_PROPERTY,
ETK_PROPERTY_INT, ETK_PROPERTY_READABLE_WRITABLE,
etk_property_value_int(ETK_TOOLBAR_BOTH_VERT));
+ etk_type_property_add(toolbar_type, "stock_size",
ETK_TOOLBAR_STOCK_SIZE_PROPERTY, ETK_PROPERTY_INT,
ETK_PROPERTY_READABLE_WRITABLE, etk_property_value_int(ETK_STOCK_SMALL));
toolbar_type->property_set = _etk_toolbar_property_set;
toolbar_type->property_get = _etk_toolbar_property_get;
@@ -96,6 +98,7 @@
break;
}
etk_button_style_set(ETK_BUTTON(widget), button_style);
+ etk_button_stock_size_set(ETK_BUTTON(widget), toolbar->stock_size);
}
etk_box_append(ETK_BOX(toolbar->box), widget, ETK_BOX_START, ETK_BOX_NONE,
0);
}
@@ -251,6 +254,50 @@
return toolbar->style;
}
+/**
+ * @brief Sets the toolbar's stock size
+ * @param toolbar a toolbar
+ * @param style the stock size
+ */
+void etk_toolbar_stock_size_set(Etk_Toolbar *toolbar, Etk_Stock_Size size)
+{
+ Evas_List *child;
+ Etk_Button *button;
+
+ if (!toolbar)
+ return;
+
+ if (toolbar->stock_size == size)
+ return;
+
+ toolbar->stock_size = size;
+
+ child = etk_container_children_get(ETK_CONTAINER(toolbar->box));
+
+ while (child)
+ {
+ if (ETK_IS_BUTTON(evas_list_data(child)))
+ {
+ button = ETK_BUTTON(evas_list_data(child));
+ etk_button_stock_size_set(button, size);
+ }
+ child = evas_list_next(child);
+ }
+ etk_object_notify(ETK_OBJECT(toolbar), "stock_size");
+}
+
+/**
+ * @brief Gets the size of the toolbar's stock
+ * @param toolbar a toolbar
+ * @return Returns the toolbar's stock size
+ */
+Etk_Stock_Size etk_toolbar_stock_size_get(Etk_Toolbar *toolbar)
+{
+ if (!toolbar)
+ return ETK_STOCK_SMALL;
+
+ return toolbar->stock_size;
+}
/**************************
*
* Etk specific functions
@@ -265,6 +312,7 @@
toolbar->style = ETK_TOOLBAR_BOTH_VERT;
toolbar->orientation = ETK_TOOLBAR_HORIZ;
+ toolbar->stock_size = ETK_STOCK_SMALL;
ETK_WIDGET(toolbar)->size_request = _etk_toolbar_size_request;
ETK_WIDGET(toolbar)->size_allocate = _etk_toolbar_size_allocate;
@@ -301,6 +349,9 @@
case ETK_TOOLBAR_STYLE_PROPERTY:
etk_toolbar_style_set(toolbar, etk_property_value_int_get(value));
break;
+ case ETK_TOOLBAR_STOCK_SIZE_PROPERTY:
+ etk_toolbar_stock_size_set(toolbar,
etk_property_value_int_get(value));
+ break;
default:
break;
}
@@ -321,6 +372,9 @@
break;
case ETK_TOOLBAR_STYLE_PROPERTY:
etk_property_value_int_set(value, toolbar->style);
+ break;
+ case ETK_TOOLBAR_STOCK_SIZE_PROPERTY:
+ etk_property_value_int_set(value, toolbar->stock_size);
break;
default:
break;
===================================================================
RCS file: /cvs/e/e17/proto/etk/src/lib/etk_toolbar.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- etk_toolbar.h 15 Aug 2006 20:56:19 -0000 1.3
+++ etk_toolbar.h 20 Aug 2006 17:49:20 -0000 1.4
@@ -6,6 +6,7 @@
#include "etk_box.h"
#include "etk_types.h"
#include "etk_utils.h"
+#include "etk_stock.h"
/**
* @defgroup Etk_Toolbar Etk_Toolbar
@@ -57,6 +58,8 @@
Etk_Widget *box;
Etk_Toolbar_Orientation orientation;
Etk_Toolbar_Style style;
+
+ Etk_Stock_Size stock_size;
};
Etk_Type *etk_toolbar_type_get();
@@ -71,6 +74,9 @@
void etk_toolbar_style_set(Etk_Toolbar *toolbar, Etk_Toolbar_Style style);
Etk_Toolbar_Style etk_toolbar_style_get(Etk_Toolbar *toolbar);
+
+void etk_toolbar_stock_size_set(Etk_Toolbar *toolbar, Etk_Stock_Size size);
+Etk_Stock_Size etk_toolbar_stock_size_get(Etk_Toolbar *toolbar);
/** @} */
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
