Commit 06d50770 authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen

Only shorten the label if it actually overlaps the resize grip.

2004-11-10  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only
	shorten the label if it actually overlaps the resize grip.
parent 6de551b5
2004-11-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only
shorten the label if it actually overlaps the resize grip.
* gdk/linux-fb/*: Fix many sparse warnings. (#157253,
Kjartan Maraas.
......
2004-11-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only
shorten the label if it actually overlaps the resize grip.
* gdk/linux-fb/*: Fix many sparse warnings. (#157253,
Kjartan Maraas.
......
2004-11-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only
shorten the label if it actually overlaps the resize grip.
* gdk/linux-fb/*: Fix many sparse warnings. (#157253,
Kjartan Maraas.
......
2004-11-10 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkstatusbar.c (gtk_statusbar_size_allocate): Only
shorten the label if it actually overlaps the resize grip.
* gdk/linux-fb/*: Fix many sparse warnings. (#157253,
Kjartan Maraas.
......
......@@ -776,7 +776,7 @@ gtk_statusbar_size_allocate (GtkWidget *widget,
if (statusbar->has_resize_grip && statusbar->grip_window)
{
GdkRectangle rect;
GdkRectangle rect, overlap;
GtkAllocation allocation;
get_grip_rect (statusbar, &rect);
......@@ -787,11 +787,14 @@ gtk_statusbar_size_allocate (GtkWidget *widget,
rect.width, rect.height);
allocation = statusbar->label->allocation;
allocation.width -= rect.width;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
allocation.x += rect.width;
gtk_widget_size_allocate (statusbar->label, &allocation);
if (gdk_rectangle_intersect (&rect, &allocation, &overlap))
{
allocation.width -= rect.width;
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
allocation.x += rect.width;
gtk_widget_size_allocate (statusbar->label, &allocation);
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment