From 521798567024f79dcca22ae5fa043960ce130a0b Mon Sep 17 00:00:00 2001 From: gustav_b Date: Thu, 6 Sep 2007 00:32:22 +0000 Subject: Prevented automatic center docking from happening and added the preference "options.dialogscancenterdock" to allow users to disable it completely. (bzr r3692) --- src/libgdl/gdl-dock-placeholder.c | 5 +---- src/libgdl/gdl-dock.c | 14 ++++---------- 2 files changed, 5 insertions(+), 14 deletions(-) (limited to 'src/libgdl') diff --git a/src/libgdl/gdl-dock-placeholder.c b/src/libgdl/gdl-dock-placeholder.c index 11c0d3127..c22ea038c 100644 --- a/src/libgdl/gdl-dock-placeholder.c +++ b/src/libgdl/gdl-dock-placeholder.c @@ -333,14 +333,11 @@ gdl_dock_placeholder_add (GtkContainer *container, GtkWidget *widget) { GdlDockPlaceholder *ph; - GdlDockPlacement pos = GDL_DOCK_CENTER; /* default position */ + GdlDockPlacement pos = GDL_DOCK_TOP; /* default position */ g_return_if_fail (GDL_IS_DOCK_PLACEHOLDER (container)); g_return_if_fail (GDL_IS_DOCK_ITEM (widget)); - if (GDL_DOCK_ITEM (widget)->behavior & GDL_DOCK_ITEM_BEH_CANT_DOCK_CENTER) - pos = GDL_DOCK_TOP; - ph = GDL_DOCK_PLACEHOLDER (container); if (ph->_priv->placement_stack) pos = (GdlDockPlacement) ph->_priv->placement_stack->data; diff --git a/src/libgdl/gdl-dock.c b/src/libgdl/gdl-dock.c index cb3e1b372..7c74791db 100644 --- a/src/libgdl/gdl-dock.c +++ b/src/libgdl/gdl-dock.c @@ -1077,17 +1077,11 @@ gdl_dock_refine_placement (GdlDock *dock, GdlDockItem *dock_item, if (placement == GDL_DOCK_LEFT || placement == GDL_DOCK_RIGHT) { /* Check if dock_object touches center in terms of width */ - if (GTK_WIDGET (dock)->allocation.width/2 > object_size.width && - !(dock_item->behavior & GDL_DOCK_ITEM_BEH_CANT_DOCK_CENTER)) { - return GDL_DOCK_CENTER; + if (GTK_WIDGET (dock)->allocation.width/2 > object_size.width) { + return GDL_DOCK_TOP; } - } else if (placement == GDL_DOCK_TOP || placement == GDL_DOCK_BOTTOM) { - /* Check if dock_object touches center in terms of height */ - if (GTK_WIDGET (dock)->allocation.height/2 > object_size.height && - !(dock_item->behavior & GDL_DOCK_ITEM_BEH_CANT_DOCK_CENTER)) { - return GDL_DOCK_CENTER; - } - } + } + return placement; } -- cgit v1.2.3