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

when !separator, don't add the focus_line_width to width/height (happens

Browse Source 
2005-07-13  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeview.c (validate_row): when !separator, don't add
	the focus_line_width to width/height (happens in
	_column_cell_get_size), but do add the vertical-separator to height,
	we weren't taking this into account before.

	* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):
	take vertical-separator into account. (#309137, Ross Burton).
This commit is contained in:
Kristian Rietveld 2005-07-13 11:57:10 +00:00 committed by Kristian Rietveld
parent 06e735a652
commit 22554a161f
5 changed files with 40 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2005-07-13 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (validate_row): when !separator, don't add
the focus_line_width to width/height (happens in
_column_cell_get_size), but do add the vertical-separator to height,
we weren't taking this into account before.
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):
take vertical-separator into account. (#309137, Ross Burton).
2005-07-13 Matthias Clasen <mclasen@redhat.com> 2005-07-13 Matthias Clasen <mclasen@redhat.com>
* tests/treestoretest.c: * tests/treestoretest.c:

10
ChangeLog.pre-2-10
View File

@ -1,3 +1,13 @@
2005-07-13 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (validate_row): when !separator, don't add
the focus_line_width to width/height (happens in
_column_cell_get_size), but do add the vertical-separator to height,
we weren't taking this into account before.
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):
take vertical-separator into account. (#309137, Ross Burton).
2005-07-13 Matthias Clasen <mclasen@redhat.com> 2005-07-13 Matthias Clasen <mclasen@redhat.com>
* tests/treestoretest.c: * tests/treestoretest.c:

10
ChangeLog.pre-2-8
View File

@ -1,3 +1,13 @@
2005-07-13 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (validate_row): when !separator, don't add
the focus_line_width to width/height (happens in
_column_cell_get_size), but do add the vertical-separator to height,
we weren't taking this into account before.
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):
take vertical-separator into account. (#309137, Ross Burton).
2005-07-13 Matthias Clasen <mclasen@redhat.com> 2005-07-13 Matthias Clasen <mclasen@redhat.com>
* tests/treestoretest.c: * tests/treestoretest.c:

7
gtk/gtkentrycompletion.c
View File

@ -1321,6 +1321,7 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
gint matches, items, height, x_border, y_border; gint matches, items, height, x_border, y_border;
GdkScreen *screen; GdkScreen *screen;
gint monitor_num; gint monitor_num;
gint vertical_separator;
GdkRectangle monitor; GdkRectangle monitor;
GtkRequisition popup_req; GtkRequisition popup_req;
GtkRequisition entry_req; GtkRequisition entry_req;
@ -1341,6 +1342,12 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
gtk_tree_view_column_cell_get_size (completion->priv->column, NULL, gtk_tree_view_column_cell_get_size (completion->priv->column, NULL,
NULL, NULL, NULL, &height); NULL, NULL, NULL, &height);
gtk_widget_style_get (GTK_WIDGET (completion->priv->tree_view),
"vertical-separator", &vertical_separator,
NULL);
height += vertical_separator;
if (items <= 0) if (items <= 0)
gtk_widget_hide (completion->priv->scrolled_window); gtk_widget_hide (completion->priv->scrolled_window);
else else

6
gtk/gtktreeview.c
View File

@ -4587,6 +4587,7 @@ validate_row (GtkTreeView *tree_view,
GList *list; GList *list;
gint height = 0; gint height = 0;
gint horizontal_separator; gint horizontal_separator;
gint vertical_separator;
gint focus_line_width; gint focus_line_width;
gint depth = gtk_tree_path_get_depth (path); gint depth = gtk_tree_path_get_depth (path);
gboolean retval = FALSE; gboolean retval = FALSE;
@ -4609,6 +4610,7 @@ validate_row (GtkTreeView *tree_view,
"focus-padding", &focus_pad, "focus-padding", &focus_pad,
"focus-line-width", &focus_line_width, "focus-line-width", &focus_line_width,
"horizontal-separator", &horizontal_separator, "horizontal-separator", &horizontal_separator,
"vertical-separator", &vertical_separator,
NULL); NULL);
for (list = tree_view->priv->columns; list; list = list->next) for (list = tree_view->priv->columns; list; list = list->next)
@ -4633,9 +4635,7 @@ validate_row (GtkTreeView *tree_view,
if (!is_separator) if (!is_separator)
{ {
tmp_width += 2 * focus_line_width; tmp_height += vertical_separator;
tmp_height += 2 * focus_line_width;
height = MAX (height, tmp_height); height = MAX (height, tmp_height);
height = MAX (height, tree_view->priv->expander_size); height = MAX (height, tree_view->priv->expander_size);
} }