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

Deprecate GtkIconView::orientation

Browse Source 
Rename the orientation property to item-orientation, since that is
closer to the meaning of the property and avoids confusion with
GtkOrientable::orientation. Also add getter and setter for the new
property, and deprecate the old property and getter/setter.
This commit is contained in:
Matthias Clasen
2010-09-01 22:39:33 -04:00
parent 49e18a29b2
commit 190b3c372a
3 changed files with 93 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtk.symbols
View File

@ -2030,6 +2030,7 @@ gtk_icon_view_get_margin
gtk_icon_view_get_markup_column gtk_icon_view_get_markup_column
gtk_icon_view_get_model gtk_icon_view_get_model
gtk_icon_view_get_orientation gtk_icon_view_get_orientation
gtk_icon_view_get_item_orientation
gtk_icon_view_get_path_at_pos gtk_icon_view_get_path_at_pos
gtk_icon_view_get_item_at_pos gtk_icon_view_get_item_at_pos
gtk_icon_view_convert_widget_to_bin_window_coords gtk_icon_view_convert_widget_to_bin_window_coords
@ -2058,6 +2059,7 @@ gtk_icon_view_set_margin
gtk_icon_view_set_markup_column gtk_icon_view_set_markup_column
gtk_icon_view_set_model gtk_icon_view_set_model
gtk_icon_view_set_orientation gtk_icon_view_set_orientation
gtk_icon_view_set_item_orientation
gtk_icon_view_set_pixbuf_column gtk_icon_view_set_pixbuf_column
gtk_icon_view_set_row_spacing gtk_icon_view_set_row_spacing
gtk_icon_view_set_selection_mode gtk_icon_view_set_selection_mode

115
gtk/gtkiconview.c
View File

@ -141,7 +141,7 @@ struct _GtkIconViewPrivate
gint cursor_cell; gint cursor_cell;
GtkOrientation orientation; GtkOrientation item_orientation;
gint columns; gint columns;
gint item_width; gint item_width;
@ -212,6 +212,7 @@ enum
PROP_MARKUP_COLUMN, PROP_MARKUP_COLUMN,
PROP_SELECTION_MODE, PROP_SELECTION_MODE,
PROP_ORIENTATION, PROP_ORIENTATION,
PROP_ITEM_ORIENTATION,
PROP_MODEL, PROP_MODEL,
PROP_COLUMNS, PROP_COLUMNS,
PROP_ITEM_WIDTH, PROP_ITEM_WIDTH,
@ -722,6 +723,8 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
* the text) of the item are positioned relative to each other. * the text) of the item are positioned relative to each other.
* *
* Since: 2.6 * Since: 2.6
*
* Deprecated: 2.22: Use the #GtkIconView::item-orientation property
*/ */
g_object_class_install_property (gobject_class, g_object_class_install_property (gobject_class,
PROP_ORIENTATION, PROP_ORIENTATION,
@ -730,7 +733,24 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
P_("How the text and icon of each item are positioned relative to each other"), P_("How the text and icon of each item are positioned relative to each other"),
GTK_TYPE_ORIENTATION, GTK_TYPE_ORIENTATION,
GTK_ORIENTATION_VERTICAL, GTK_ORIENTATION_VERTICAL,
GTK_PARAM_READWRITE)); GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
/**
* GtkIconView:item-orientation:
*
* The item-orientation property specifies how the cells (i.e. the icon and
* the text) of the item are positioned relative to each other.
*
* Since: 2.22
*/
g_object_class_install_property (gobject_class,
PROP_ITEM_ORIENTATION,
g_param_spec_enum ("item-orientation",
P_("Item Orientation"),
P_("How the text and icon of each item are positioned relative to each other"),
GTK_TYPE_ORIENTATION,
GTK_ORIENTATION_VERTICAL,
GTK_PARAM_READWRITE));
/** /**
* GtkIconView:reorderable: * GtkIconView:reorderable:
@ -1114,7 +1134,7 @@ gtk_icon_view_init (GtkIconView *icon_view)
icon_view->priv->n_cells = 0; icon_view->priv->n_cells = 0;
icon_view->priv->cursor_cell = -1; icon_view->priv->cursor_cell = -1;
icon_view->priv->orientation = GTK_ORIENTATION_VERTICAL; icon_view->priv->item_orientation = GTK_ORIENTATION_VERTICAL;
icon_view->priv->columns = -1; icon_view->priv->columns = -1;
icon_view->priv->item_width = -1; icon_view->priv->item_width = -1;
@ -1205,7 +1225,8 @@ gtk_icon_view_set_property (GObject *object,
gtk_icon_view_set_model (icon_view, g_value_get_object (value)); gtk_icon_view_set_model (icon_view, g_value_get_object (value));
break; break;
case PROP_ORIENTATION: case PROP_ORIENTATION:
gtk_icon_view_set_orientation (icon_view, g_value_get_enum (value)); case PROP_ITEM_ORIENTATION:
gtk_icon_view_set_item_orientation (icon_view, g_value_get_enum (value));
break; break;
case PROP_COLUMNS: case PROP_COLUMNS:
gtk_icon_view_set_columns (icon_view, g_value_get_int (value)); gtk_icon_view_set_columns (icon_view, g_value_get_int (value));
@ -1271,7 +1292,8 @@ gtk_icon_view_get_property (GObject *object,
g_value_set_object (value, icon_view->priv->model); g_value_set_object (value, icon_view->priv->model);
break; break;
case PROP_ORIENTATION: case PROP_ORIENTATION:
g_value_set_enum (value, icon_view->priv->orientation); case PROP_ITEM_ORIENTATION:
g_value_set_enum (value, icon_view->priv->item_orientation);
break; break;
case PROP_COLUMNS: case PROP_COLUMNS:
g_value_set_int (value, icon_view->priv->columns); g_value_set_int (value, icon_view->priv->columns);
@ -2885,7 +2907,7 @@ gtk_icon_view_get_cell_area (GtkIconView *icon_view,
{ {
g_return_if_fail (info->position < item->n_cells); g_return_if_fail (info->position < item->n_cells);
if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL) if (icon_view->priv->item_orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
cell_area->x = item->box[info->position].x - item->before[info->position]; cell_area->x = item->box[info->position].x - item->before[info->position];
cell_area->y = item->y + icon_view->priv->item_padding; cell_area->y = item->y + icon_view->priv->item_padding;
@ -2946,7 +2968,7 @@ adjust_wrap_width (GtkIconView *icon_view,
else else
item_width = item->width; item_width = item->width;
if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL) if (icon_view->priv->item_orientation == GTK_ORIENTATION_VERTICAL)
wrap_width = item_width; wrap_width = item_width;
else { else {
if (item->width == -1 && item_width <= 0) if (item->width == -1 && item_width <= 0)
@ -3003,7 +3025,7 @@ gtk_icon_view_calculate_item_size (GtkIconView *icon_view,
&item->box[info->position].width, &item->box[info->position].width,
&item->box[info->position].height); &item->box[info->position].height);
if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL) if (icon_view->priv->item_orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
item->width += item->box[info->position].width item->width += item->box[info->position].width
+ (info->position > 0 ? spacing : 0); + (info->position > 0 ? spacing : 0);
@ -3040,7 +3062,7 @@ gtk_icon_view_calculate_item_size2 (GtkIconView *icon_view,
item->height = 0; item->height = 0;
for (i = 0; i < icon_view->priv->n_cells; i++) for (i = 0; i < icon_view->priv->n_cells; i++)
{ {
if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL) if (icon_view->priv->item_orientation == GTK_ORIENTATION_HORIZONTAL)
item->height = MAX (item->height, max_height[i]); item->height = MAX (item->height, max_height[i]);
else else
item->height += max_height[i] + (i > 0 ? spacing : 0); item->height += max_height[i] + (i > 0 ? spacing : 0);
@ -3060,7 +3082,7 @@ gtk_icon_view_calculate_item_size2 (GtkIconView *icon_view,
if (!info->cell->visible) if (!info->cell->visible)
continue; continue;
if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL) if (icon_view->priv->item_orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
/* We should not subtract icon_view->priv->item_padding from item->height, /* We should not subtract icon_view->priv->item_padding from item->height,
* because item->height is recalculated above using * because item->height is recalculated above using
@ -3085,7 +3107,7 @@ gtk_icon_view_calculate_item_size2 (GtkIconView *icon_view,
item->box[info->position].x += cell_area.x; item->box[info->position].x += cell_area.x;
item->box[info->position].y += cell_area.y; item->box[info->position].y += cell_area.y;
if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL) if (icon_view->priv->item_orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
item->before[info->position] = item->box[info->position].x - cell_area.x; item->before[info->position] = item->box[info->position].x - cell_area.x;
item->after[info->position] = cell_area.width - item->box[info->position].width - item->before[info->position]; item->after[info->position] = cell_area.width - item->box[info->position].width - item->before[info->position];
@ -3104,7 +3126,7 @@ gtk_icon_view_calculate_item_size2 (GtkIconView *icon_view,
} }
} }
if (rtl && icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL) if (rtl && icon_view->priv->item_orientation == GTK_ORIENTATION_HORIZONTAL)
{ {
for (i = 0; i < icon_view->priv->n_cells; i++) for (i = 0; i < icon_view->priv->n_cells; i++)
{ {
@ -3907,7 +3929,7 @@ find_cell (GtkIconView *icon_view,
gint i, k; gint i, k;
GList *l; GList *l;
if (icon_view->priv->orientation != orientation) if (icon_view->priv->item_orientation != orientation)
return cell; return cell;
gtk_icon_view_set_cell_data (icon_view, item); gtk_icon_view_set_cell_data (icon_view, item);
@ -5486,7 +5508,7 @@ update_text_cell (GtkIconView *icon_view)
"text", icon_view->priv->text_column, "text", icon_view->priv->text_column,
NULL); NULL);
if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL) if (icon_view->priv->item_orientation == GTK_ORIENTATION_VERTICAL)
g_object_set (info->cell, g_object_set (info->cell,
"alignment", PANGO_ALIGN_CENTER, "alignment", PANGO_ALIGN_CENTER,
"wrap-mode", PANGO_WRAP_WORD_CHAR, "wrap-mode", PANGO_WRAP_WORD_CHAR,
@ -5554,7 +5576,7 @@ update_pixbuf_cell (GtkIconView *icon_view)
"pixbuf", icon_view->priv->pixbuf_column, "pixbuf", icon_view->priv->pixbuf_column,
NULL); NULL);
if (icon_view->priv->orientation == GTK_ORIENTATION_VERTICAL) if (icon_view->priv->item_orientation == GTK_ORIENTATION_VERTICAL)
g_object_set (info->cell, g_object_set (info->cell,
"xalign", 0.5, "xalign", 0.5,
"yalign", 1.0, "yalign", 1.0,
@ -6023,24 +6045,24 @@ gtk_icon_view_item_activated (GtkIconView *icon_view,
} }
/** /**
* gtk_icon_view_set_orientation: * gtk_icon_view_set_item_orientation:
* @icon_view: a #GtkIconView * @icon_view: a #GtkIconView
* @orientation: the relative position of texts and icons * @orientation: the relative position of texts and icons
* *
* Sets the ::orientation property which determines whether the labels * Sets the ::item-orientation property which determines whether
* are drawn beside the icons instead of below. * the labels are drawn beside the icons instead of below.
* *
* Since: 2.6 * Since: 2.22
**/ **/
void void
gtk_icon_view_set_orientation (GtkIconView *icon_view, gtk_icon_view_set_item_orientation (GtkIconView *icon_view,
GtkOrientation orientation) GtkOrientation orientation)
{ {
g_return_if_fail (GTK_IS_ICON_VIEW (icon_view)); g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
if (icon_view->priv->orientation != orientation) if (icon_view->priv->item_orientation != orientation)
{ {
icon_view->priv->orientation = orientation; icon_view->priv->item_orientation = orientation;
gtk_icon_view_stop_editing (icon_view, TRUE); gtk_icon_view_stop_editing (icon_view, TRUE);
gtk_icon_view_invalidate_sizes (icon_view); gtk_icon_view_invalidate_sizes (icon_view);
@ -6049,10 +6071,50 @@ gtk_icon_view_set_orientation (GtkIconView *icon_view,
update_text_cell (icon_view); update_text_cell (icon_view);
update_pixbuf_cell (icon_view); update_pixbuf_cell (icon_view);
g_object_notify (G_OBJECT (icon_view), "item-orientation");
g_object_notify (G_OBJECT (icon_view), "orientation"); g_object_notify (G_OBJECT (icon_view), "orientation");
} }
} }
/**
* gtk_icon_view_set_orientation:
* @icon_view: a #GtkIconView
* @orientation: the relative position of texts and icons
*
* Sets the ::orientation property which determines whether the labels
* are drawn beside the icons instead of below.
*
* Since: 2.6
*
* Deprecated: 2.22: Use gtk_icon_view_set_item_orientation()
**/
void
gtk_icon_view_set_orientation (GtkIconView *icon_view,
GtkOrientation orientation)
{
gtk_icon_view_set_item_orientation (icon_view, orientation);
}
/**
* gtk_icon_view_get_item_orientation:
* @icon_view: a #GtkIconView
*
* Returns the value of the ::item-orientation property which determines
* whether the labels are drawn beside the icons instead of below.
*
* Return value: the relative position of texts and icons
*
* Since: 2.22
*/
GtkOrientation
gtk_icon_view_get_item_orientation (GtkIconView *icon_view)
{
g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view),
GTK_ORIENTATION_VERTICAL);
return icon_view->priv->item_orientation;
}
/** /**
* gtk_icon_view_get_orientation: * gtk_icon_view_get_orientation:
* @icon_view: a #GtkIconView * @icon_view: a #GtkIconView
@ -6063,14 +6125,13 @@ gtk_icon_view_set_orientation (GtkIconView *icon_view,
* Return value: the relative position of texts and icons * Return value: the relative position of texts and icons
* *
* Since: 2.6 * Since: 2.6
*
* Deprecated: 2.22: Use gtk_icon_view_get_item_orientation()
**/ **/
GtkOrientation GtkOrientation
gtk_icon_view_get_orientation (GtkIconView *icon_view) gtk_icon_view_get_orientation (GtkIconView *icon_view)
{ {
g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view), return gtk_icon_view_get_item_orientation (icon_view);
GTK_ORIENTATION_VERTICAL);
return icon_view->priv->orientation;
} }
/** /**

3
gtk/gtkiconview.h
View File

@ -107,6 +107,9 @@ gint gtk_icon_view_get_pixbuf_column (GtkIconView *icon_view);
void gtk_icon_view_set_orientation (GtkIconView *icon_view, void gtk_icon_view_set_orientation (GtkIconView *icon_view,
GtkOrientation orientation); GtkOrientation orientation);
GtkOrientation gtk_icon_view_get_orientation (GtkIconView *icon_view); GtkOrientation gtk_icon_view_get_orientation (GtkIconView *icon_view);
void gtk_icon_view_set_item_orientation (GtkIconView *icon_view,
GtkOrientation orientation);
GtkOrientation gtk_icon_view_get_item_orientation (GtkIconView *icon_view);
void gtk_icon_view_set_columns (GtkIconView *icon_view, void gtk_icon_view_set_columns (GtkIconView *icon_view,
gint columns); gint columns);
gint gtk_icon_view_get_columns (GtkIconView *icon_view); gint gtk_icon_view_get_columns (GtkIconView *icon_view);