AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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.
This commit is contained in:
Matthias Clasen 2004-11-10 15:32:19 +00:00 committed by Matthias Clasen
parent 6de551b504
commit 06d507703d
5 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,5 +1,8 @@
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.

3
ChangeLog.pre-2-10
View File

@ -1,5 +1,8 @@
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.

3
ChangeLog.pre-2-6
View File

@ -1,5 +1,8 @@
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.

3
ChangeLog.pre-2-8
View File

@ -1,5 +1,8 @@
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.

15
gtk/gtkstatusbar.c
View File

@ -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);
}
}
}