Commit bf2e5fc1 authored by Kristian Rietveld's avatar Kristian Rietveld Committed by Kristian Rietveld

Merged from stable.

Tue Jun 10 01:09:33 2003  Kristian Rietveld  <kris@gtk.org>

	Merged from stable.

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
	Remove the weird dx logic, get all cell_area and background_area
	calculations right. Not sure what was up with it before. (Fixes
	#110989, testcase from Vasco Alexandre da Silva Costa).
parent 171fd90c
Tue Jun 10 01:09:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
Remove the weird dx logic, get all cell_area and background_area
calculations right. Not sure what was up with it before. (Fixes
#110989, testcase from Vasco Alexandre da Silva Costa).
Tue Jun 10 00:58:23 2003 Soeren Sandmann <sandmann@daimi.au.dk> Tue Jun 10 00:58:23 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* tests/testgtk.c: Make it compile with C89 compilers * tests/testgtk.c: Make it compile with C89 compilers
......
Tue Jun 10 01:09:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
Remove the weird dx logic, get all cell_area and background_area
calculations right. Not sure what was up with it before. (Fixes
#110989, testcase from Vasco Alexandre da Silva Costa).
Tue Jun 10 00:58:23 2003 Soeren Sandmann <sandmann@daimi.au.dk> Tue Jun 10 00:58:23 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* tests/testgtk.c: Make it compile with C89 compilers * tests/testgtk.c: Make it compile with C89 compilers
......
Tue Jun 10 01:09:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
Remove the weird dx logic, get all cell_area and background_area
calculations right. Not sure what was up with it before. (Fixes
#110989, testcase from Vasco Alexandre da Silva Costa).
Tue Jun 10 00:58:23 2003 Soeren Sandmann <sandmann@daimi.au.dk> Tue Jun 10 00:58:23 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* tests/testgtk.c: Make it compile with C89 compilers * tests/testgtk.c: Make it compile with C89 compilers
......
Tue Jun 10 01:09:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
Remove the weird dx logic, get all cell_area and background_area
calculations right. Not sure what was up with it before. (Fixes
#110989, testcase from Vasco Alexandre da Silva Costa).
Tue Jun 10 00:58:23 2003 Soeren Sandmann <sandmann@daimi.au.dk> Tue Jun 10 00:58:23 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* tests/testgtk.c: Make it compile with C89 compilers * tests/testgtk.c: Make it compile with C89 compilers
......
Tue Jun 10 01:09:33 2003 Kristian Rietveld <kris@gtk.org>
Merged from stable.
* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_cell_process_action):
Remove the weird dx logic, get all cell_area and background_area
calculations right. Not sure what was up with it before. (Fixes
#110989, testcase from Vasco Alexandre da Silva Costa).
Tue Jun 10 00:58:23 2003 Soeren Sandmann <sandmann@daimi.au.dk> Tue Jun 10 00:58:23 2003 Soeren Sandmann <sandmann@daimi.au.dk>
* tests/testgtk.c: Make it compile with C89 compilers * tests/testgtk.c: Make it compile with C89 compilers
......
...@@ -2482,8 +2482,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column, ...@@ -2482,8 +2482,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
gint extra_space; gint extra_space;
gint min_x, min_y, max_x, max_y; gint min_x, min_y, max_x, max_y;
gint focus_line_width; gint focus_line_width;
gint dx;
gint special_cells; gint special_cells;
gint horizontal_separator;
gboolean cursor_row = FALSE; gboolean cursor_row = FALSE;
gboolean rtl; gboolean rtl;
/* If we have rtl text, we need to transform our areas */ /* If we have rtl text, we need to transform our areas */
...@@ -2526,11 +2526,11 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column, ...@@ -2526,11 +2526,11 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
gtk_widget_style_get (GTK_WIDGET (tree_column->tree_view), gtk_widget_style_get (GTK_WIDGET (tree_column->tree_view),
"focus-line-width", &focus_line_width, "focus-line-width", &focus_line_width,
"horizontal-seperator", &horizontal_separator,
NULL); NULL);
real_cell_area = *cell_area; real_cell_area = *cell_area;
real_background_area = *background_area; real_background_area = *background_area;
/* HUH? dx = real_cell_area.x - real_background_area.x - focus_line_width; */
real_cell_area.x += focus_line_width; real_cell_area.x += focus_line_width;
...@@ -2547,7 +2547,7 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column, ...@@ -2547,7 +2547,7 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
full_requested_width += info->requested_width; full_requested_width += info->requested_width;
} }
extra_space = cell_area->width - full_requested_width; extra_space = cell_area->width + horizontal_separator - full_requested_width;
if (extra_space < 0) if (extra_space < 0)
extra_space = 0; extra_space = 0;
...@@ -2570,11 +2570,11 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column, ...@@ -2570,11 +2570,11 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
else else
flags &= ~GTK_CELL_RENDERER_FOCUSED; flags &= ~GTK_CELL_RENDERER_FOCUSED;
real_background_area.width = info->requested_width + info->real_width = info->requested_width + (info->expand?extra_space:0);
(info->expand?extra_space:0);
info->real_width = real_background_area.width;
real_cell_area.width = real_background_area.width; real_cell_area.width = info->real_width;
real_background_area.width=
real_cell_area.x + real_cell_area.width - real_background_area.x;
real_cell_area.width -= 2 * focus_line_width; real_cell_area.width -= 2 * focus_line_width;
rtl_cell_area = real_cell_area; rtl_cell_area = real_cell_area;
...@@ -2705,8 +2705,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column, ...@@ -2705,8 +2705,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
flags &= ~GTK_CELL_RENDERER_FOCUSED; flags &= ~GTK_CELL_RENDERER_FOCUSED;
real_cell_area.x += (info->real_width + tree_column->spacing); real_cell_area.x += (real_cell_area.width + tree_column->spacing);
real_background_area.x += (info->real_width + tree_column->spacing); real_background_area.x += (real_background_area.width + tree_column->spacing);
} }
/* iterate list for PACK_END cells */ /* iterate list for PACK_END cells */
...@@ -2725,11 +2725,11 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column, ...@@ -2725,11 +2725,11 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
else else
flags &= ~GTK_CELL_RENDERER_FOCUSED; flags &= ~GTK_CELL_RENDERER_FOCUSED;
real_background_area.width = info->requested_width + info->real_width = info->requested_width + (info->expand?extra_space:0);
(info->expand?extra_space:0);
info->real_width = real_background_area.width;
real_cell_area.width = real_background_area.width; real_cell_area.width = info->real_width;
real_background_area.width =
real_cell_area.x + real_cell_area.width - real_background_area.x;
real_cell_area.width -= 2 * focus_line_width; real_cell_area.width -= 2 * focus_line_width;
rtl_cell_area = real_cell_area; rtl_cell_area = real_cell_area;
...@@ -2858,8 +2858,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column, ...@@ -2858,8 +2858,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
flags &= ~GTK_CELL_RENDERER_FOCUSED; flags &= ~GTK_CELL_RENDERER_FOCUSED;
real_cell_area.x += (info->real_width + tree_column->spacing); real_cell_area.x += (real_cell_area.width + tree_column->spacing);
real_background_area.x += (info->real_width + tree_column->spacing); real_background_area.x += (real_background_area.width + tree_column->spacing);
} }
/* fill focus_rectangle when required */ /* fill focus_rectangle when required */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment