callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make this work in RTL context.

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

	* gtk/gtktreeviewcolumn.c (_gtk_tree_view_column_get_neighbor_sizes):
	Make this work in RTL context.
This commit is contained in:
Matthias Clasen 2004-07-13 21:26:19 +00:00 committed by Matthias Clasen
parent fa349466ec
commit 754c15ede1
5 changed files with 51 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,8 @@
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> 2004-07-13 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a * gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a
@ -10,6 +15,7 @@
Prepare to handle composite implementations of Prepare to handle composite implementations of
GtkCellEditable, but recursively poking at GtkCellEditable, but recursively poking at
allocation->y (hack stolen from GtkCList). allocation->y (hack stolen from GtkCList).
(check_expander_max): Tweak the warning.
* gtk/gtkmain.h: Add gtk_parse_args(), its a public * gtk/gtkmain.h: Add gtk_parse_args(), its a public
function. (#147476, Owen Taylor) function. (#147476, Owen Taylor)

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
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> 2004-07-13 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a * gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a
@ -10,6 +15,7 @@
Prepare to handle composite implementations of Prepare to handle composite implementations of
GtkCellEditable, but recursively poking at GtkCellEditable, but recursively poking at
allocation->y (hack stolen from GtkCList). allocation->y (hack stolen from GtkCList).
(check_expander_max): Tweak the warning.
* gtk/gtkmain.h: Add gtk_parse_args(), its a public * gtk/gtkmain.h: Add gtk_parse_args(), its a public
function. (#147476, Owen Taylor) function. (#147476, Owen Taylor)

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
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> 2004-07-13 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a * gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a
@ -10,6 +15,7 @@
Prepare to handle composite implementations of Prepare to handle composite implementations of
GtkCellEditable, but recursively poking at GtkCellEditable, but recursively poking at
allocation->y (hack stolen from GtkCList). allocation->y (hack stolen from GtkCList).
(check_expander_max): Tweak the warning.
* gtk/gtkmain.h: Add gtk_parse_args(), its a public * gtk/gtkmain.h: Add gtk_parse_args(), its a public
function. (#147476, Owen Taylor) function. (#147476, Owen Taylor)

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
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> 2004-07-13 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a * gtk/gtkfilechooserdefault.c (shortcuts_activate_volume): Set a
@ -10,6 +15,7 @@
Prepare to handle composite implementations of Prepare to handle composite implementations of
GtkCellEditable, but recursively poking at GtkCellEditable, but recursively poking at
allocation->y (hack stolen from GtkCList). allocation->y (hack stolen from GtkCList).
(check_expander_max): Tweak the warning.
* gtk/gtkmain.h: Add gtk_parse_args(), its a public * gtk/gtkmain.h: Add gtk_parse_args(), its a public
function. (#147476, Owen Taylor) function. (#147476, Owen Taylor)

42
gtk/gtktreeviewcolumn.c
View File

@ -2677,7 +2677,7 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
real_cell_area.x += focus_line_width; 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) for (list = tree_column->cell_list; list; list = list->next)
{ {
GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)list->data; GtkTreeViewColumnCellInfo *info = (GtkTreeViewColumnCellInfo *)list->data;
@ -2813,8 +2813,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
event, event,
tree_column->tree_view, tree_column->tree_view,
path_string, path_string,
background_area, &rtl_background_area,
cell_area, &rtl_cell_area,
flags)) flags))
{ {
flags &= ~GTK_CELL_RENDERER_FOCUSED; flags &= ~GTK_CELL_RENDERER_FOCUSED;
@ -2828,8 +2828,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
event, event,
tree_column->tree_view, tree_column->tree_view,
path_string, path_string,
background_area, &rtl_background_area,
cell_area, &rtl_cell_area,
flags); flags);
if (*editable_widget != NULL) if (*editable_widget != NULL)
@ -2967,8 +2967,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
event, event,
tree_column->tree_view, tree_column->tree_view,
path_string, path_string,
background_area, &rtl_background_area,
cell_area, &rtl_cell_area,
flags)) flags))
{ {
flags &= ~GTK_CELL_RENDERER_FOCUSED; flags &= ~GTK_CELL_RENDERER_FOCUSED;
@ -2982,8 +2982,8 @@ gtk_tree_view_column_cell_process_action (GtkTreeViewColumn *tree_column,
event, event,
tree_column->tree_view, tree_column->tree_view,
path_string, path_string,
background_area, &rtl_background_area,
cell_area, &rtl_cell_area,
flags); flags);
if (*editable_widget != NULL) if (*editable_widget != NULL)
@ -3492,10 +3492,22 @@ _gtk_tree_view_column_get_neighbor_sizes (GtkTreeViewColumn *column,
gint *right) gint *right)
{ {
GList *list; 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); list = gtk_tree_view_column_cell_first (column);
for (; list; list = gtk_tree_view_column_cell_next (column, list)) 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; break;
if (info->cell->visible) if (info->cell->visible)
*left += info->real_width; *rtl_left += info->real_width;
} }
} }
if (right) if (rtl_right)
{ {
GList *next; GList *next;
*right = 0; *rtl_right = 0;
list = gtk_tree_view_column_cell_first (column); list = gtk_tree_view_column_cell_first (column);
for (; list; list = gtk_tree_view_column_cell_next (column, list)) 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; (GtkTreeViewColumnCellInfo *)list->data;
if (info->cell->visible) if (info->cell->visible)
*right += info->real_width; *rtl_right += info->real_width;
} }
} }
} }