gdl r521 - in trunk: . gdl
- From: jhs svn gnome org
- To: svn-commits-list gnome org
- Subject: gdl r521 - in trunk: . gdl
- Date: Sun, 1 Mar 2009 14:08:50 +0000 (UTC)
Author: jhs
Date: Sun Mar 1 14:08:50 2009
New Revision: 521
URL: http://svn.gnome.org/viewvc/gdl?rev=521&view=rev
Log:
2009-03-01 Johannes Schmid <jhs gnome org>
* gdl/gdl-dock-item-grip.c (gdl_dock_item_grip_realize),
(gdl_dock_item_grip_size_request),
(gdl_dock_item_grip_size_allocate):
#573522 â More patches for GDL
(Thanks much to Joel Holdsworth <joel airwebreathe org uk> for the patches)
* gdl/gdl-dock-item.c:
Add documentation for gdl_dock_item_set_default_position()
Modified:
trunk/ChangeLog
trunk/gdl/gdl-dock-item-grip.c
trunk/gdl/gdl-dock-item.c
Modified: trunk/gdl/gdl-dock-item-grip.c
==============================================================================
--- trunk/gdl/gdl-dock-item-grip.c (original)
+++ trunk/gdl/gdl-dock-item-grip.c Sun Mar 1 14:08:50 2009
@@ -404,9 +404,8 @@
gdk_window_set_user_data (grip->title_window, widget);
- if (GDL_DOCK_ITEM_CANT_CLOSE (grip->item))
- cursor = NULL;
- else if (GDL_DOCK_ITEM_CANT_ICONIFY (grip->item))
+ if (GDL_DOCK_ITEM_CANT_CLOSE (grip->item) &&
+ GDL_DOCK_ITEM_CANT_ICONIFY (grip->item))
cursor = NULL;
else
cursor = gdk_cursor_new_for_display (gtk_widget_get_display (widget),
@@ -475,15 +474,17 @@
pango_layout_get_pixel_size (grip->_priv->title_layout, NULL, &layout_height);
gtk_widget_size_request (grip->_priv->close_button, &child_requisition);
-
- requisition->width += child_requisition.width;
layout_height = MAX (layout_height, child_requisition.height);
+ if (GTK_WIDGET_VISIBLE (grip->_priv->close_button)) {
+ requisition->width += child_requisition.width;
+ }
gtk_widget_size_request (grip->_priv->iconify_button, &child_requisition);
-
- requisition->width += child_requisition.width;
layout_height = MAX (layout_height, child_requisition.height);
-
+ if (GTK_WIDGET_VISIBLE (grip->_priv->iconify_button)) {
+ requisition->width += child_requisition.width;
+ }
+
requisition->height += layout_height;
if (grip->_priv->icon_pixbuf) {
@@ -556,33 +557,35 @@
child_allocation.x = allocation->x + allocation->width - container->border_width;
child_allocation.y = allocation->y + container->border_width;
- gtk_widget_size_request (grip->_priv->close_button, &button_requisition);
+ if (GTK_WIDGET_VISIBLE (grip->_priv->close_button)) {
+ gtk_widget_size_request (grip->_priv->close_button, &button_requisition);
- if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL)
- child_allocation.x -= button_requisition.width;
-
- child_allocation.width = button_requisition.width;
- child_allocation.height = button_requisition.height;
-
- gtk_widget_size_allocate (grip->_priv->close_button, &child_allocation);
-
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
- child_allocation.x += button_requisition.width;
+ if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL)
+ child_allocation.x -= button_requisition.width;
+ child_allocation.width = button_requisition.width;
+ child_allocation.height = button_requisition.height;
+
+ gtk_widget_size_allocate (grip->_priv->close_button, &child_allocation);
- gtk_widget_size_request (grip->_priv->iconify_button, &button_requisition);
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ child_allocation.x += button_requisition.width;
+ }
- if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL)
- child_allocation.x -= button_requisition.width;
+ if (GTK_WIDGET_VISIBLE (grip->_priv->iconify_button)) {
+ gtk_widget_size_request (grip->_priv->iconify_button, &button_requisition);
- child_allocation.width = button_requisition.width;
- child_allocation.height = button_requisition.height;
+ if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_RTL)
+ child_allocation.x -= button_requisition.width;
- gtk_widget_size_allocate (grip->_priv->iconify_button, &child_allocation);
+ child_allocation.width = button_requisition.width;
+ child_allocation.height = button_requisition.height;
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
- child_allocation.x += button_requisition.width;
+ gtk_widget_size_allocate (grip->_priv->iconify_button, &child_allocation);
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ child_allocation.x += button_requisition.width;
+ }
if (grip->title_window) {
GdkRectangle area;
Modified: trunk/gdl/gdl-dock-item.c
==============================================================================
--- trunk/gdl/gdl-dock-item.c (original)
+++ trunk/gdl/gdl-dock-item.c Sun Mar 1 14:08:50 2009
@@ -2030,6 +2030,15 @@
g_object_set (item, "locked", FALSE, NULL);
}
+/**
+ * gdl_dock_item_set_default_position:
+ * @item: The dock item
+ * @reference: The GdlDockObject which is the default dock for @item
+ *
+ * This method has only an effect when you add you dock_item with
+ * GDL_DOCK_ITEM_BEH_NEVER_FLOATING. In this case you have to assign
+ * it a default position.
+ **/
void
gdl_dock_item_set_default_position (GdlDockItem *item,
GdlDockObject *reference)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]