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

Bug 547449 – Entry/ Combo popup misplaced after resize

Browse Source 
svn path=/trunk/; revision=21263
This commit is contained in:
Christian Dywan 2008-09-03 12:38:32 +00:00
parent ebbe9743db
commit 446fd7d72a
3 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2008-09-03 Christian Dywan <christian@imendio.com>
Bug 547449 – Entry/ Combo popup misplaced after resize
* gtk/gtkcombobox.c (gtk_combo_box_menu_position),
(gtk_combo_box_size_allocate): reposition the combo popup when the
allocation changes
* gtk/gtkentry.c (gtk_entry_size_allocate): reposition the
completion popup when the allocation changes
2008-09-03 Michael Natterer <mitch@imendio.com> 2008-09-03 Michael Natterer <mitch@imendio.com>
* gtk/gtkmenu.c (get_arrows_visible_area): proper function header * gtk/gtkmenu.c (get_arrows_visible_area): proper function header

31
gtk/gtkcombobox.c
View File

@ -1605,8 +1605,9 @@ gtk_combo_box_menu_position (GtkMenu *menu,
gtk_combo_box_menu_position_over (menu, x, y, push_in, user_data); gtk_combo_box_menu_position_over (menu, x, y, push_in, user_data);
} }
gtk_window_set_type_hint (GTK_WINDOW (GTK_MENU (priv->popup_widget)->toplevel), if (!GTK_WIDGET_VISIBLE (GTK_MENU (priv->popup_widget)->toplevel))
GDK_WINDOW_TYPE_HINT_COMBO); gtk_window_set_type_hint (GTK_WINDOW (GTK_MENU (priv->popup_widget)->toplevel),
GDK_WINDOW_TYPE_HINT_COMBO);
} }
static void static void
@ -2293,6 +2294,23 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
child.width -= child.x; child.width -= child.x;
} }
if (GTK_WIDGET_VISIBLE (priv->popup_widget))
{
gint width;
GtkRequisition requisition;
/* Warning here, without the check in the position func */
gtk_menu_reposition (GTK_MENU (priv->popup_widget));
if (priv->wrap_width == 0)
{
width = GTK_WIDGET (combo_box)->allocation.width;
gtk_widget_set_size_request (priv->popup_widget, -1, -1);
gtk_widget_size_request (priv->popup_widget, &requisition);
gtk_widget_set_size_request (priv->popup_widget,
MAX (width, requisition.width), -1);
}
}
child.width = MAX (1, child.width); child.width = MAX (1, child.width);
child.height = MAX (1, child.height); child.height = MAX (1, child.height);
gtk_widget_size_allocate (GTK_BIN (widget)->child, &child); gtk_widget_size_allocate (GTK_BIN (widget)->child, &child);
@ -2362,6 +2380,15 @@ gtk_combo_box_size_allocate (GtkWidget *widget,
child.width -= delta_x * 2; child.width -= delta_x * 2;
child.height -= delta_y * 2; child.height -= delta_y * 2;
} }
if (GTK_WIDGET_VISIBLE (priv->popup_window))
{
gint x, y, width, height;
gtk_combo_box_list_position (combo_box, &x, &y, &width, &height);
gtk_window_move (GTK_WINDOW (priv->popup_window), x, y);
gtk_widget_set_size_request (priv->popup_window, width, height);
}
child.width = MAX (1, child.width); child.width = MAX (1, child.width);
child.height = MAX (1, child.height); child.height = MAX (1, child.height);

5
gtk/gtkentry.c
View File

@ -1581,6 +1581,7 @@ gtk_entry_size_allocate (GtkWidget *widget,
* be affected by the usize of the entry, if set * be affected by the usize of the entry, if set
*/ */
gint x, y, width, height; gint x, y, width, height;
GtkEntryCompletion* completion;
get_widget_window_size (entry, &x, &y, &width, &height); get_widget_window_size (entry, &x, &y, &width, &height);
@ -1593,6 +1594,10 @@ gtk_entry_size_allocate (GtkWidget *widget,
x, y, width, height); x, y, width, height);
gtk_entry_recompute (entry); gtk_entry_recompute (entry);
completion = gtk_entry_get_completion (entry);
if (completion && GTK_WIDGET_MAPPED (completion->priv->popup_window))
_gtk_entry_completion_resize_popup (completion);
} }
} }