Skip to content

gtk
gtk
Commit 754c15ed authored by Matthias Clasen's avatar Matthias Clasen Committed by Matthias Clasen
Browse files
Options

Make this work in RTL context. 

2004-07-13  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes):
	Make this work in RTL context.
parent fa349466
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 15 deletions
ChangeLog
View file @ 754c15ed
2004-07-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes):
Make this work in RTL context.
2004-07-13 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a
......@@ -10,6 +15,7 @@
Prepare to handle composite implementations of
GtkCellEditable, but recursively poking at
allocation->y (hack stolen from GtkCList).
(check_expander_max): Tweak the warning.
* gtk/gtkmain.h: Add gtk_parse_args(), its a public
function. (#147476, Owen Taylor)
......
ChangeLog.pre-2-10
View file @ 754c15ed
2004-07-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes):
Make this work in RTL context.
2004-07-13 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a
......@@ -10,6 +15,7 @@
Prepare to handle composite implementations of
GtkCellEditable, but recursively poking at
allocation->y (hack stolen from GtkCList).
(check_expander_max): Tweak the warning.
* gtk/gtkmain.h: Add gtk_parse_args(), its a public
function. (#147476, Owen Taylor)
......
ChangeLog.pre-2-6
View file @ 754c15ed
2004-07-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes):
Make this work in RTL context.
2004-07-13 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a
......@@ -10,6 +15,7 @@
Prepare to handle composite implementations of
GtkCellEditable, but recursively poking at
allocation->y (hack stolen from GtkCList).
(check_expander_max): Tweak the warning.
* gtk/gtkmain.h: Add gtk_parse_args(), its a public
function. (#147476, Owen Taylor)
......
ChangeLog.pre-2-8
View file @ 754c15ed
2004-07-13 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes):
Make this work in RTL context.
2004-07-13 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a
......@@ -10,6 +15,7 @@
Prepare to handle composite implementations of
GtkCellEditable, but recursively poking at
allocation->y (hack stolen from GtkCList).
(check_expander_max): Tweak the warning.
* gtk/gtkmain.h: Add gtk_parse_args(), its a public
function. (#147476, Owen Taylor)
......
gtk/gtktreeviewcolumn.c
View file @ 754c15ed
......@@ -2677,7 +2677,7 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
real_cell_area.x += focus_line_width;
/* Find out how many extra space we have to allocate */
/* Find out how much extra space we have to allocate */
for (list = tree_column->cell_list; list; list = list->next)
{
GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)list->data;
......@@ -2813,8 +2813,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
event,
tree_column->tree_view,
path_string,
background_area,
cell_area,
&rtl_background_area,
&rtl_cell_area,
flags))
{
flags &= ~GTK_CELL_RENDERER_FOCUSED;
......@@ -2828,8 +2828,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
event,
tree_column->tree_view,
path_string,
background_area,
cell_area,
&rtl_background_area,
&rtl_cell_area,
flags);
if (*editable_widget != NULL)
......@@ -2967,8 +2967,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
event,
tree_column->tree_view,
path_string,
background_area,
cell_area,
&rtl_background_area,
&rtl_cell_area,
flags))
{
flags &= ~GTK_CELL_RENDERER_FOCUSED;
......@@ -2982,8 +2982,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
event,
tree_column->tree_view,
path_string,
background_area,
cell_area,
&rtl_background_area,
&rtl_cell_area,
flags);
if (*editable_widget != NULL)
......@@ -3492,10 +3492,22 @@ _gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column,
gint *right)
{
GList *list;
gint *rtl_left, *rtl_right;
if (left)
if (gtk_widget_get_direction (GTK_WIDGET (column->tree_view)) == GTK_TEXT_DIR_RTL)
{
*left = 0;
rtl_left = right;
rtl_right = left;
}
else
{
rtl_left = left;
rtl_right = right;
}
if (rtl_left)
{
*rtl_left = 0;
list = gtk_tree_view_column_cell_first (column);
for (; list; list = gtk_tree_view_column_cell_next (column, list))
......@@ -3507,15 +3519,15 @@ _gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column,
break;
if (info->cell->visible)
*left += info->real_width;
*rtl_left += info->real_width;
}
}
if (right)
if (rtl_right)
{
GList *next;
*right = 0;
*rtl_right = 0;
list = gtk_tree_view_column_cell_first (column);
for (; list; list = gtk_tree_view_column_cell_next (column, list))
......@@ -3538,7 +3550,7 @@ _gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column,
(GtkTreeViewColumnCellInfo *)list->data;
if (info->cell->visible)
*right += info->real_width;
*rtl_right += info->real_width;
}
}
}
......
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