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

Fixed bug where right justified menu would overlap last left justified

Browse Source 
Sun Apr  5 21:47:12 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk/gtkmenubar.c: Fixed bug where right justified
	menu would overlap last left justified item.
This commit is contained in:
Owen Taylor 1998-04-06 02:00:48 +00:00 committed by Owen Taylor
parent 20fee708a3
commit 79d880ccb7
8 changed files with 46 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Sun Apr 5 21:47:12 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenubar.c: Fixed bug where right justified
menu would overlap last left justified item.
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu> Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value * gtk/gtkclist.c: Fixed assignment of adjustment->value

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
Sun Apr 5 21:47:12 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenubar.c: Fixed bug where right justified
menu would overlap last left justified item.
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu> Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value * gtk/gtkclist.c: Fixed assignment of adjustment->value

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Sun Apr 5 21:47:12 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenubar.c: Fixed bug where right justified
menu would overlap last left justified item.
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu> Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value * gtk/gtkclist.c: Fixed assignment of adjustment->value

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
Sun Apr 5 21:47:12 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenubar.c: Fixed bug where right justified
menu would overlap last left justified item.
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu> Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value * gtk/gtkclist.c: Fixed assignment of adjustment->value

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
Sun Apr 5 21:47:12 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenubar.c: Fixed bug where right justified
menu would overlap last left justified item.
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu> Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value * gtk/gtkclist.c: Fixed assignment of adjustment->value

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Sun Apr 5 21:47:12 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenubar.c: Fixed bug where right justified
menu would overlap last left justified item.
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu> Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value * gtk/gtkclist.c: Fixed assignment of adjustment->value

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Sun Apr 5 21:47:12 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmenubar.c: Fixed bug where right justified
menu would overlap last left justified item.
Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu> Sun Apr 5 19:30:23 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkclist.c: Fixed assignment of adjustment->value * gtk/gtkclist.c: Fixed assignment of adjustment->value

11
gtk/gtkmenubar.c
View File

@ -149,6 +149,12 @@ gtk_menu_bar_size_request (GtkWidget *widget,
requisition->width += child->requisition.width; requisition->width += child->requisition.width;
requisition->height = MAX (requisition->height, child->requisition.height); requisition->height = MAX (requisition->height, child->requisition.height);
/* Support for the right justified help menu */
if ( (children == NULL) && (GTK_IS_MENU_ITEM(child))
&& (GTK_MENU_ITEM(child)->right_justify))
{
requisition->width += CHILD_SPACING;
}
nchildren += 1; nchildren += 1;
} }
@ -210,9 +216,10 @@ gtk_menu_bar_size_allocate (GtkWidget *widget,
/* Support for the right justified help menu */ /* Support for the right justified help menu */
if ( (children == NULL) && (GTK_IS_MENU_ITEM(child)) if ( (children == NULL) && (GTK_IS_MENU_ITEM(child))
&& (GTK_MENU_ITEM(child)->right_justify)) { && (GTK_MENU_ITEM(child)->right_justify))
{
child_allocation.x = allocation->width - child_allocation.x = allocation->width -
child_allocation.width - CHILD_SPACING - offset; child->requisition.width - CHILD_SPACING - offset;
} }
if (GTK_WIDGET_VISIBLE (child)) if (GTK_WIDGET_VISIBLE (child))
{ {