forked from AuroraMiddleware/gtk
entry-completion: don't subtract entry borders from popup allocation
The completion popup should be aligned with the GtkEntry allocation, not less than that. https://bugzilla.gnome.org/show_bug.cgi?id=672947
This commit is contained in:
parent
3f54cf9e78
commit
644070b551
@ -1469,7 +1469,6 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
|
||||
GtkAllocation allocation;
|
||||
gint x, y;
|
||||
gint matches, actions, items, height;
|
||||
GtkBorder borders;
|
||||
GdkScreen *screen;
|
||||
gint monitor_num;
|
||||
gint vertical_separator;
|
||||
@ -1496,8 +1495,6 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
|
||||
x += allocation.x;
|
||||
y += allocation.y + (allocation.height - entry_req.height) / 2;
|
||||
|
||||
_gtk_entry_get_borders (GTK_ENTRY (completion->priv->entry), &borders);
|
||||
|
||||
matches = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (completion->priv->filter_model), NULL);
|
||||
actions = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (completion->priv->actions), NULL);
|
||||
action_column = gtk_tree_view_get_column (GTK_TREE_VIEW (completion->priv->action_view), 0);
|
||||
@ -1532,7 +1529,7 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
|
||||
gtk_widget_show (completion->priv->scrolled_window);
|
||||
|
||||
if (completion->priv->popup_set_width)
|
||||
width = MIN (allocation.width, monitor.width) - borders.left - borders.right;
|
||||
width = MIN (allocation.width, monitor.width);
|
||||
else
|
||||
width = -1;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user