mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-24 12:41:16 +00:00
Only show the separator if both children are present and visible.
Mon May 21 11:29:21 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtk{h,v,}paned.c: Only show the separator if both children are present and visible. * configure.in: Fixed reversed conditional causing all image libraries to be linked in.
This commit is contained in:
parent
b85c587152
commit
479810cac7
@ -1,3 +1,10 @@
|
||||
Mon May 21 11:29:21 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk{h,v,}paned.c: Only show the separator if
|
||||
|
||||
* configure.in: Fixed reversed conditional causing all image
|
||||
libraries to be linked in.
|
||||
|
||||
2001-05-21 Joe Shaw <joe@ximian.com>
|
||||
|
||||
* gtk/gtklayout.c (gtk_text_layout_get_lines): Remove the assertion
|
||||
|
@ -1,3 +1,10 @@
|
||||
Mon May 21 11:29:21 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk{h,v,}paned.c: Only show the separator if
|
||||
|
||||
* configure.in: Fixed reversed conditional causing all image
|
||||
libraries to be linked in.
|
||||
|
||||
2001-05-21 Joe Shaw <joe@ximian.com>
|
||||
|
||||
* gtk/gtklayout.c (gtk_text_layout_get_lines): Remove the assertion
|
||||
|
@ -1,3 +1,10 @@
|
||||
Mon May 21 11:29:21 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk{h,v,}paned.c: Only show the separator if
|
||||
|
||||
* configure.in: Fixed reversed conditional causing all image
|
||||
libraries to be linked in.
|
||||
|
||||
2001-05-21 Joe Shaw <joe@ximian.com>
|
||||
|
||||
* gtk/gtklayout.c (gtk_text_layout_get_lines): Remove the assertion
|
||||
|
@ -1,3 +1,10 @@
|
||||
Mon May 21 11:29:21 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk{h,v,}paned.c: Only show the separator if
|
||||
|
||||
* configure.in: Fixed reversed conditional causing all image
|
||||
libraries to be linked in.
|
||||
|
||||
2001-05-21 Joe Shaw <joe@ximian.com>
|
||||
|
||||
* gtk/gtklayout.c (gtk_text_layout_get_lines): Remove the assertion
|
||||
|
@ -1,3 +1,10 @@
|
||||
Mon May 21 11:29:21 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk{h,v,}paned.c: Only show the separator if
|
||||
|
||||
* configure.in: Fixed reversed conditional causing all image
|
||||
libraries to be linked in.
|
||||
|
||||
2001-05-21 Joe Shaw <joe@ximian.com>
|
||||
|
||||
* gtk/gtklayout.c (gtk_text_layout_get_lines): Remove the assertion
|
||||
|
@ -1,3 +1,10 @@
|
||||
Mon May 21 11:29:21 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk{h,v,}paned.c: Only show the separator if
|
||||
|
||||
* configure.in: Fixed reversed conditional causing all image
|
||||
libraries to be linked in.
|
||||
|
||||
2001-05-21 Joe Shaw <joe@ximian.com>
|
||||
|
||||
* gtk/gtklayout.c (gtk_text_layout_get_lines): Remove the assertion
|
||||
|
@ -1,3 +1,10 @@
|
||||
Mon May 21 11:29:21 2001 Owen Taylor <otaylor@redhat.com>
|
||||
|
||||
* gtk/gtk{h,v,}paned.c: Only show the separator if
|
||||
|
||||
* configure.in: Fixed reversed conditional causing all image
|
||||
libraries to be linked in.
|
||||
|
||||
2001-05-21 Joe Shaw <joe@ximian.com>
|
||||
|
||||
* gtk/gtklayout.c (gtk_text_layout_get_lines): Remove the assertion
|
||||
|
@ -564,8 +564,6 @@ AM_CONDITIONAL(HAVE_PNG, test "x$LIBPNG" != x)
|
||||
AM_CONDITIONAL(HAVE_JPEG, test "x$LIBJPEG" != x)
|
||||
|
||||
if $dynworks ; then
|
||||
STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
|
||||
else
|
||||
STATIC_LIB_DEPS=
|
||||
if echo "$included_loaders" | grep "\(^\|\,\)tiff\(\$\|\,\)" > /dev/null; then
|
||||
STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBTIFF"
|
||||
@ -576,6 +574,8 @@ else
|
||||
if echo "$included_loaders" | grep "\(^\|\,\)png\(\$\|\,\)" > /dev/null; then
|
||||
STATIC_LIB_DEPS="$STATIC_LIB_DEPS $LIBPNG"
|
||||
fi
|
||||
else
|
||||
STATIC_LIB_DEPS="$LIBTIFF $LIBJPEG $LIBPNG"
|
||||
fi
|
||||
|
||||
# Checks to see if we should compile in MMX support (there will be
|
||||
|
@ -495,7 +495,6 @@ This can later be composited together with other
|
||||
#GtkRcStyle structures to form a #GtkStyle.
|
||||
</para>
|
||||
|
||||
@parent_instance:
|
||||
@name:
|
||||
@bg_pixmap_name:
|
||||
@font_desc:
|
||||
|
@ -115,9 +115,6 @@ gtk_hpaned_size_request (GtkWidget *widget,
|
||||
{
|
||||
GtkPaned *paned = GTK_PANED (widget);
|
||||
GtkRequisition child_requisition;
|
||||
gint handle_size;
|
||||
|
||||
gtk_widget_style_get (widget, "handle_size", &handle_size, NULL);
|
||||
|
||||
requisition->width = 0;
|
||||
requisition->height = 0;
|
||||
@ -138,8 +135,17 @@ gtk_hpaned_size_request (GtkWidget *widget,
|
||||
requisition->width += child_requisition.width;
|
||||
}
|
||||
|
||||
requisition->width += GTK_CONTAINER (paned)->border_width * 2 + handle_size;
|
||||
requisition->width += GTK_CONTAINER (paned)->border_width * 2;
|
||||
requisition->height += GTK_CONTAINER (paned)->border_width * 2;
|
||||
|
||||
if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
|
||||
paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
|
||||
{
|
||||
gint handle_size;
|
||||
|
||||
gtk_widget_style_get (widget, "handle_size", &handle_size, NULL);
|
||||
requisition->width += handle_size;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
@ -148,25 +154,27 @@ gtk_hpaned_size_allocate (GtkWidget *widget,
|
||||
{
|
||||
GtkPaned *paned = GTK_PANED (widget);
|
||||
gint border_width = GTK_CONTAINER (paned)->border_width;
|
||||
gint handle_size;
|
||||
GtkRequisition child1_requisition;
|
||||
GtkRequisition child2_requisition;
|
||||
|
||||
widget->allocation = *allocation;
|
||||
if (GTK_WIDGET_REALIZED (widget))
|
||||
gdk_window_move_resize (widget->window,
|
||||
allocation->x, allocation->y,
|
||||
allocation->width,
|
||||
allocation->height);
|
||||
|
||||
if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
|
||||
paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
|
||||
{
|
||||
GtkAllocation child1_allocation;
|
||||
GtkAllocation child2_allocation;
|
||||
GtkRequisition child1_requisition;
|
||||
GtkRequisition child2_requisition;
|
||||
gint handle_size;
|
||||
|
||||
gtk_widget_style_get (widget, "handle_size", &handle_size, NULL);
|
||||
|
||||
widget->allocation = *allocation;
|
||||
|
||||
if (paned->child1)
|
||||
gtk_widget_get_child_requisition (paned->child1, &child1_requisition);
|
||||
else
|
||||
child1_requisition.width = 0;
|
||||
|
||||
if (paned->child2)
|
||||
gtk_widget_get_child_requisition (paned->child2, &child2_requisition);
|
||||
else
|
||||
child2_requisition.width = 0;
|
||||
|
||||
gtk_paned_compute_position (paned,
|
||||
MAX (1, widget->allocation.width
|
||||
@ -184,11 +192,7 @@ gtk_hpaned_size_allocate (GtkWidget *widget,
|
||||
|
||||
if (GTK_WIDGET_REALIZED (widget))
|
||||
{
|
||||
gdk_window_move_resize (widget->window,
|
||||
allocation->x, allocation->y,
|
||||
allocation->width,
|
||||
allocation->height);
|
||||
|
||||
gdk_window_show (paned->handle);
|
||||
gdk_window_move_resize (paned->handle,
|
||||
paned->handle_xpos,
|
||||
paned->handle_ypos,
|
||||
@ -207,21 +211,35 @@ gtk_hpaned_size_allocate (GtkWidget *widget,
|
||||
/* Now allocate the childen, making sure, when resizing not to
|
||||
* overlap the windows */
|
||||
if (GTK_WIDGET_MAPPED (widget) &&
|
||||
paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
|
||||
paned->child1->allocation.width < child1_allocation.width)
|
||||
{
|
||||
if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
|
||||
gtk_widget_size_allocate (paned->child2, &child2_allocation);
|
||||
gtk_widget_size_allocate (paned->child1, &child1_allocation);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1))
|
||||
gtk_widget_size_allocate (paned->child1, &child1_allocation);
|
||||
if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
|
||||
gtk_widget_size_allocate (paned->child2, &child2_allocation);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
GtkAllocation child_allocation;
|
||||
|
||||
if (GTK_WIDGET_REALIZED (widget))
|
||||
gdk_window_hide (paned->handle);
|
||||
|
||||
child_allocation.x = border_width;
|
||||
child_allocation.y = border_width;
|
||||
child_allocation.width = MAX (1, allocation->width - 2 * border_width);
|
||||
child_allocation.height = MAX (1, allocation->height - 2 * border_width);
|
||||
|
||||
if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1))
|
||||
gtk_widget_size_allocate (paned->child1, &child_allocation);
|
||||
else if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
|
||||
gtk_widget_size_allocate (paned->child2, &child_allocation);
|
||||
}
|
||||
}
|
||||
|
||||
static gint
|
||||
gtk_hpaned_expose (GtkWidget *widget,
|
||||
|
@ -267,6 +267,8 @@ gtk_paned_realize (GtkWidget *widget)
|
||||
|
||||
gdk_window_set_back_pixmap (widget->window, NULL, TRUE);
|
||||
|
||||
if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
|
||||
paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
|
||||
gdk_window_show (paned->handle);
|
||||
}
|
||||
|
||||
|
@ -115,9 +115,6 @@ gtk_vpaned_size_request (GtkWidget *widget,
|
||||
{
|
||||
GtkPaned *paned = GTK_PANED (widget);
|
||||
GtkRequisition child_requisition;
|
||||
gint handle_size;
|
||||
|
||||
gtk_widget_style_get (widget, "handle_size", &handle_size, NULL);
|
||||
|
||||
requisition->width = 0;
|
||||
requisition->height = 0;
|
||||
@ -138,8 +135,17 @@ gtk_vpaned_size_request (GtkWidget *widget,
|
||||
requisition->height += child_requisition.height;
|
||||
}
|
||||
|
||||
requisition->height += GTK_CONTAINER (paned)->border_width * 2 + handle_size;
|
||||
requisition->height += GTK_CONTAINER (paned)->border_width * 2;
|
||||
requisition->width += GTK_CONTAINER (paned)->border_width * 2;
|
||||
|
||||
if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
|
||||
paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
|
||||
{
|
||||
gint handle_size;
|
||||
|
||||
gtk_widget_style_get (widget, "handle_size", &handle_size, NULL);
|
||||
requisition->height += handle_size;
|
||||
}
|
||||
}
|
||||
|
||||
static void
|
||||
@ -147,27 +153,28 @@ gtk_vpaned_size_allocate (GtkWidget *widget,
|
||||
GtkAllocation *allocation)
|
||||
{
|
||||
GtkPaned *paned = GTK_PANED (widget);
|
||||
gint border_width = GTK_CONTAINER (paned)->border_width;
|
||||
|
||||
widget->allocation = *allocation;
|
||||
if (GTK_WIDGET_REALIZED (widget))
|
||||
gdk_window_move_resize (widget->window,
|
||||
allocation->x, allocation->y,
|
||||
allocation->width,
|
||||
allocation->height);
|
||||
|
||||
if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
|
||||
paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
|
||||
{
|
||||
GtkRequisition child1_requisition;
|
||||
GtkRequisition child2_requisition;
|
||||
GtkAllocation child1_allocation;
|
||||
GtkAllocation child2_allocation;
|
||||
gint border_width;
|
||||
gint handle_size;
|
||||
|
||||
widget->allocation = *allocation;
|
||||
|
||||
border_width = GTK_CONTAINER (widget)->border_width;
|
||||
gtk_widget_style_get (widget, "handle_size", &handle_size, NULL);
|
||||
|
||||
if (paned->child1)
|
||||
gtk_widget_get_child_requisition (paned->child1, &child1_requisition);
|
||||
else
|
||||
child1_requisition.height = 0;
|
||||
|
||||
if (paned->child2)
|
||||
gtk_widget_get_child_requisition (paned->child2, &child2_requisition);
|
||||
else
|
||||
child2_requisition.height = 0;
|
||||
|
||||
gtk_paned_compute_position (paned,
|
||||
MAX (1, widget->allocation.height
|
||||
@ -185,11 +192,7 @@ gtk_vpaned_size_allocate (GtkWidget *widget,
|
||||
|
||||
if (GTK_WIDGET_REALIZED(widget))
|
||||
{
|
||||
gdk_window_move_resize (widget->window,
|
||||
allocation->x, allocation->y,
|
||||
allocation->width,
|
||||
allocation->height);
|
||||
|
||||
gdk_window_show (paned->handle);
|
||||
gdk_window_move_resize (paned->handle,
|
||||
paned->handle_xpos,
|
||||
paned->handle_ypos,
|
||||
@ -208,21 +211,35 @@ gtk_vpaned_size_allocate (GtkWidget *widget,
|
||||
/* Now allocate the childen, making sure, when resizing not to
|
||||
* overlap the windows */
|
||||
if (GTK_WIDGET_MAPPED (widget) &&
|
||||
paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) &&
|
||||
paned->child1->allocation.height < child1_allocation.height)
|
||||
{
|
||||
if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
|
||||
gtk_widget_size_allocate(paned->child2, &child2_allocation);
|
||||
gtk_widget_size_allocate(paned->child1, &child1_allocation);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1))
|
||||
gtk_widget_size_allocate(paned->child1, &child1_allocation);
|
||||
if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
|
||||
gtk_widget_size_allocate(paned->child2, &child2_allocation);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
GtkAllocation child_allocation;
|
||||
|
||||
if (GTK_WIDGET_REALIZED (widget))
|
||||
gdk_window_hide (paned->handle);
|
||||
|
||||
child_allocation.x = border_width;
|
||||
child_allocation.y = border_width;
|
||||
child_allocation.width = MAX (1, allocation->width - 2 * border_width);
|
||||
child_allocation.height = MAX (1, allocation->height - 2 * border_width);
|
||||
|
||||
if (paned->child1 && GTK_WIDGET_VISIBLE (paned->child1))
|
||||
gtk_widget_size_allocate (paned->child1, &child_allocation);
|
||||
else if (paned->child2 && GTK_WIDGET_VISIBLE (paned->child2))
|
||||
gtk_widget_size_allocate (paned->child2, &child_allocation);
|
||||
}
|
||||
}
|
||||
|
||||
static gint
|
||||
gtk_vpaned_expose (GtkWidget *widget,
|
||||
|
Loading…
Reference in New Issue
Block a user