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

treeviewcolumn: Remove cell_area parameter from _cell_get_size

Browse Source 
Fixes #297
This commit is contained in:
Timm Bäder 2019-08-09 17:04:58 +02:00
parent 21123a1264
commit fd201e4df7
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkentrycompletion.c
View File

@ -1365,9 +1365,9 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
*/
gtk_widget_get_preferred_size (completion->priv->tree_view,
&tree_req, NULL);
gtk_tree_view_column_cell_get_size (completion->priv->column, NULL,
gtk_tree_view_column_cell_get_size (completion->priv->column,
NULL, NULL, NULL, &height);
gtk_tree_view_column_cell_get_size (action_column, NULL,
gtk_tree_view_column_cell_get_size (action_column,
NULL, NULL, NULL, &action_height);
gtk_widget_realize (completion->priv->tree_view);

4
gtk/gtktreeview.c
View File

@ -5669,8 +5669,8 @@ validate_row (GtkTreeView *tree_view,
GTK_TREE_RBNODE_FLAG_SET (node, GTK_TREE_RBNODE_IS_PARENT),
node->children?TRUE:FALSE);
gtk_tree_view_column_cell_get_size (column,
NULL, NULL, NULL,
NULL, &row_height);
NULL, NULL,
NULL, &row_height);
if (is_separator)
{

9
gtk/gtktreeviewcolumn.c
View File

@ -2758,11 +2758,10 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
**/
void
gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
const GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height)
int *x_offset,
int *y_offset,
int *width,
int *height)
{
GtkTreeViewColumnPrivate *priv;
gint min_width = 0, min_height = 0;

9
gtk/gtktreeviewcolumn.h
View File

@ -223,11 +223,10 @@ void gtk_tree_view_column_cell_set_cell_data (GtkTreeViewCol
gboolean is_expanded);
GDK_AVAILABLE_IN_ALL
void gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
const GdkRectangle *cell_area,
gint *x_offset,
gint *y_offset,
gint *width,
gint *height);
int *x_offset,
int *y_offset,
int *width,
int *height);
GDK_AVAILABLE_IN_ALL
gboolean gtk_tree_view_column_cell_is_visible (GtkTreeViewColumn *tree_column);
GDK_AVAILABLE_IN_ALL