callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some bugs with set_default_size.

Browse Source 
Sun Feb  7 19:49:21 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwindow.c (gtk_window_move_resize): Fixed some
	  bugs with set_default_size.

Sat Feb  6 13:23:51 1999  Owen Taylor  <otaylor@redhat.com>

	* docs/Changes-1.2.txt: Added information about
	 the change to gtk_widget_size_request().

	* gtk/gtkentry.c: Call gtk_widget_get_child_requisition
	 explicitely since we differentiate between the usize
	 set by the user and what we got. (Ugh)

	* gtk/gtkwidget.[ch] (gtk_widget_get_child_requisition):
	 New function to return the effective size of a widget
	 as it looks to its parent.

	* gtk/gtkwidget.c (gtk_widget_size_request): Leave
	 widget->requisition set to exactly what the widget
	 asked for, and then make a copy of that into
	 the requisition argument. Allow a NULL requisition
	 argument, and, if G_ENABLE_DEBUG, warn if
	 requisition == &widget->requisition.

	* gtkalignment.c gtkaspectframe.c gtkbutton.c gtkclist.c
	  gtkcontainer.c gtkentry.c gtkeventbox.c gtkfixed.c
	  gtkframe.c gtkhandlebox.c gtkhbox.c gtkhpaned.c
	  gtklayout.c gtklist.c gtklistitem.c gtkmenu.c
	  gtkmenubar.c gtkmenuitem.c gtknotebook.c
	  gtkoptionmenu.c gtkpacker.c gtkscrolledwindow.c
	  gtktable.c gtktoolbar.c gtktree.c gtktreeitem.c
	  gtkvbox.c gtkviewport.c gtkvpaned.c gtkwindow.c

	 Avoid calling gtk_widget_size_request with
	 requisition == widget->requisition; use
	 gtk_widget_get_child_requisition to get the
	 size of children.
This commit is contained in:
Owen Taylor
1999-02-10 02:35:09 +00:00
committed by Owen Taylor
parent 84d9f5f9a1
commit d1bda8d562
44 changed files with 747 additions and 222 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
gtk/gtkmenu.c
View File

@ -702,6 +702,7 @@ gtk_menu_size_request (GtkWidget *widget,
GList *children;
guint max_toggle_size;
guint max_accel_width;
GtkRequisition child_requisition;
g_return_if_fail (widget != NULL);
g_return_if_fail (GTK_IS_MENU (widget));
@ -725,10 +726,10 @@ gtk_menu_size_request (GtkWidget *widget,
if (GTK_WIDGET_VISIBLE (child))
{
GTK_MENU_ITEM (child)->show_submenu_indicator = TRUE;
gtk_widget_size_request (child, &child->requisition);
gtk_widget_size_request (child, &child_requisition);
requisition->width = MAX (requisition->width, child->requisition.width);
requisition->height += child->requisition.height;
requisition->width = MAX (requisition->width, child_requisition.width);
requisition->height += child_requisition.height;
max_toggle_size = MAX (max_toggle_size, MENU_ITEM_CLASS (child)->toggle_size);
max_accel_width = MAX (max_accel_width, GTK_MENU_ITEM (child)->accelerator_width);
@ -791,7 +792,10 @@ gtk_menu_size_allocate (GtkWidget *widget,
if (GTK_WIDGET_VISIBLE (child))
{
child_allocation.height = child->requisition.height;
GtkRequisition child_requisition;
gtk_widget_get_child_requisition (child, &child_requisition);
child_allocation.height = child_requisition.height;
gtk_widget_size_allocate (child, &child_allocation);
gtk_widget_queue_draw (child);
@ -1013,6 +1017,7 @@ static void
gtk_menu_position (GtkMenu *menu)
{
GtkWidget *widget;
GtkRequisition requisition;
gint x, y;
g_return_if_fail (menu != NULL);
@ -1027,7 +1032,7 @@ gtk_menu_position (GtkMenu *menu)
* if one a size_request was queued while we weren't popped up,
* the requisition won't have been recomputed yet.
*/
gtk_widget_size_request (widget, &widget->requisition);
gtk_widget_size_request (widget, &requisition);
if (menu->position_func)
(* menu->position_func) (menu, &x, &y, menu->position_func_data);
@ -1042,12 +1047,12 @@ gtk_menu_position (GtkMenu *menu)
x -= 2;
y -= 2;
if ((x + widget->requisition.width) > screen_width)
x -= ((x + widget->requisition.width) - screen_width);
if ((x + requisition.width) > screen_width)
x -= ((x + requisition.width) - screen_width);
if (x < 0)
x = 0;
if ((y + widget->requisition.height) > screen_height)
y -= ((y + widget->requisition.height) - screen_height);
if ((y + requisition.height) > screen_height)
y -= ((y + requisition.height) - screen_height);
if (y < 0)
y = 0;
}