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

Add a new :orientation property to determine whether text is positioned

Browse Source 
Sat Jul 17 23:11:04 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkiconview.h:
	* gtk/gtkiconview.c (gtk_icon_view_class_init):
	* gtk/gtkiconview.c (gtk_icon_view_set_orientation):
	* gtk/gtkiconview.c (gtk_icon_view_get_orientation):
	* gtk/gtkiconview.c (gtk_icon_view_calculate_item_size):
	* gtk/gtkiconview.c (gtk_icon_view_layout_single_row):
	Add a new :orientation property to determine whether text
	is positioned below or beside icons.  (#147463)
This commit is contained in:
Matthias Clasen 2004-07-18 03:39:50 +00:00 committed by Matthias Clasen
parent 01d19b8190
commit 8ed28a9a1a
6 changed files with 156 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
Sat Jul 17 23:11:04 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.h:
* gtk/gtkiconview.c (gtk_icon_view_class_init):
* gtk/gtkiconview.c (gtk_icon_view_set_orientation):
* gtk/gtkiconview.c (gtk_icon_view_get_orientation):
* gtk/gtkiconview.c (gtk_icon_view_calculate_item_size):
* gtk/gtkiconview.c (gtk_icon_view_layout_single_row):
Add a new :orientation property to determine whether text
is positioned below or beside icons. (#147463)
Sat Jul 17 23:03:30 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.c (gtk_icon_view_paint_item):

11
ChangeLog.pre-2-10
View File

@ -1,3 +1,14 @@
Sat Jul 17 23:11:04 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.h:
* gtk/gtkiconview.c (gtk_icon_view_class_init):
* gtk/gtkiconview.c (gtk_icon_view_set_orientation):
* gtk/gtkiconview.c (gtk_icon_view_get_orientation):
* gtk/gtkiconview.c (gtk_icon_view_calculate_item_size):
* gtk/gtkiconview.c (gtk_icon_view_layout_single_row):
Add a new :orientation property to determine whether text
is positioned below or beside icons. (#147463)
Sat Jul 17 23:03:30 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.c (gtk_icon_view_paint_item):

11
ChangeLog.pre-2-6
View File

@ -1,3 +1,14 @@
Sat Jul 17 23:11:04 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.h:
* gtk/gtkiconview.c (gtk_icon_view_class_init):
* gtk/gtkiconview.c (gtk_icon_view_set_orientation):
* gtk/gtkiconview.c (gtk_icon_view_get_orientation):
* gtk/gtkiconview.c (gtk_icon_view_calculate_item_size):
* gtk/gtkiconview.c (gtk_icon_view_layout_single_row):
Add a new :orientation property to determine whether text
is positioned below or beside icons. (#147463)
Sat Jul 17 23:03:30 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.c (gtk_icon_view_paint_item):

11
ChangeLog.pre-2-8
View File

@ -1,3 +1,14 @@
Sat Jul 17 23:11:04 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.h:
* gtk/gtkiconview.c (gtk_icon_view_class_init):
* gtk/gtkiconview.c (gtk_icon_view_set_orientation):
* gtk/gtkiconview.c (gtk_icon_view_get_orientation):
* gtk/gtkiconview.c (gtk_icon_view_calculate_item_size):
* gtk/gtkiconview.c (gtk_icon_view_layout_single_row):
Add a new :orientation property to determine whether text
is positioned below or beside icons. (#147463)
Sat Jul 17 23:03:30 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkiconview.c (gtk_icon_view_paint_item):

112
gtk/gtkiconview.c
View File

@ -112,6 +112,8 @@ struct _GtkIconViewPrivate
/* Layout used to draw icon text */
PangoLayout *layout;
GtkOrientation orientation;
};
/* Signals */
@ -136,6 +138,7 @@ enum
PROP_TEXT_COLUMN,
PROP_MARKUP_COLUMN,
PROP_SELECTION_MODE,
PROP_ORIENTATION,
PROP_MODEL,
};
@ -382,6 +385,14 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
GTK_TYPE_TREE_MODEL,
G_PARAM_READWRITE));
g_object_class_install_property (gobject_class,
PROP_ORIENTATION,
g_param_spec_enum ("orientation",
P_("Orientation"),
P_("How the text and icon of each item are positioned relative to each other"),
GTK_TYPE_ORIENTATION,
GTK_ORIENTATION_VERTICAL,
G_PARAM_READWRITE));
/* Style properties */
gtk_widget_class_install_style_property (widget_class,
@ -566,6 +577,8 @@ gtk_icon_view_init (GtkIconView *icon_view)
GTK_WIDGET_SET_FLAGS (icon_view, GTK_CAN_FOCUS);
gtk_icon_view_set_adjustments (icon_view, NULL, NULL);
icon_view->priv->orientation = GTK_ORIENTATION_VERTICAL;
}
static void
@ -627,6 +640,9 @@ gtk_icon_view_set_property (GObject *object,
case PROP_MODEL:
gtk_icon_view_set_model (icon_view, g_value_get_object (value));
break;
case PROP_ORIENTATION:
gtk_icon_view_set_orientation (icon_view, g_value_get_enum (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@ -661,6 +677,9 @@ gtk_icon_view_get_property (GObject *object,
case PROP_MODEL:
g_value_set_object (value, icon_view->priv->model);
break;
case PROP_ORIENTATION:
g_value_set_enum (value, icon_view->priv->orientation);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@ -1480,8 +1499,24 @@ gtk_icon_view_layout_single_row (GtkIconView *icon_view, GList *first_item, gint
x += (MINIMUM_ICON_ITEM_WIDTH - item->width);
}
item->pixbuf_x = item->x + (item->width - item->pixbuf_width) / 2;
item->layout_x = item->x + (item->width - item->layout_width) / 2;
if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
if (gtk_widget_get_direction (GTK_WIDGET (icon_view)) == GTK_TEXT_DIR_RTL)
{
item->layout_x = item->x + ICON_TEXT_PADDING + focus_width + focus_pad;
item->pixbuf_x = item->x + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad) + item->layout_width;
}
else
{
item->pixbuf_x = item->x;
item->layout_x = item->x + item->pixbuf_width + ICON_TEXT_PADDING + focus_width + focus_pad;
}
}
else
{
item->pixbuf_x = item->x + (item->width - item->pixbuf_width) / 2;
item->layout_x = item->x + (item->width - item->layout_width) / 2;
}
x += item->width;
@ -1507,8 +1542,16 @@ gtk_icon_view_layout_single_row (GtkIconView *icon_view, GList *first_item, gint
{
GtkIconViewItem *item = items->data;
item->pixbuf_y = item->y + (max_pixbuf_height - item->pixbuf_height);
item->layout_y = item->pixbuf_y + item->pixbuf_height + ICON_TEXT_PADDING + focus_width + focus_pad;
if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
item->pixbuf_y = item->y;
item->layout_y = item->y + ICON_TEXT_PADDING + focus_width + focus_pad;
}
else
{
item->pixbuf_y = item->y + (max_pixbuf_height - item->pixbuf_height);
item->layout_y = item->pixbuf_y + item->pixbuf_height + ICON_TEXT_PADDING + focus_width + focus_pad;
}
/* Update the bounding box */
item->y = item->pixbuf_y;
@ -1644,9 +1687,6 @@ gtk_icon_view_calculate_item_size (GtkIconView *icon_view,
pango_layout_get_pixel_size (icon_view->priv->layout, &layout_width, &layout_height);
item->width = MAX (layout_width + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad), item->pixbuf_width);
item->height = layout_height + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad) + item->pixbuf_height;
item->layout_width = layout_width;
item->layout_height = layout_height;
}
@ -1655,6 +1695,17 @@ gtk_icon_view_calculate_item_size (GtkIconView *icon_view,
item->layout_width = 0;
item->layout_height = 0;
}
if (icon_view->priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
item->width = layout_width + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad) + item->pixbuf_width;
item->height = MAX (layout_height + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad), item->pixbuf_height);
}
else
{
item->width = MAX (layout_width + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad), item->pixbuf_width);
item->height = layout_height + 2 * (ICON_TEXT_PADDING + focus_width + focus_pad) + item->pixbuf_height;
}
}
static void
@ -3346,3 +3397,50 @@ gtk_icon_view_item_activated (GtkIconView *icon_view,
g_signal_emit (G_OBJECT (icon_view), icon_view_signals[ITEM_ACTIVATED], 0, path);
}
/**
* 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
**/
void
gtk_icon_view_set_orientation (GtkIconView *icon_view,
GtkOrientation orientation)
{
g_return_if_fail (GTK_IS_ICON_VIEW (icon_view));
if (icon_view->priv->orientation != orientation)
{
icon_view->priv->orientation = orientation;
gtk_icon_view_invalidate_sizes (icon_view);
gtk_icon_view_queue_layout (icon_view);
g_object_notify (G_OBJECT (icon_view), "orientation");
}
}
/**
* gtk_icon_view_get_orientation:
* @icon_view: a #GtkIconView
*
* Returns the value of the ::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.6
**/
GtkOrientation
gtk_icon_view_get_orientation (GtkIconView *icon_view)
{
g_return_val_if_fail (GTK_IS_ICON_VIEW (icon_view),
GTK_ORIENTATION_VERTICAL);
return icon_view->priv->orientation;
}

7
gtk/gtkiconview.h
View File

@ -86,6 +86,10 @@ void gtk_icon_view_set_pixbuf_column (GtkIconView *icon_view,
gint column);
gint gtk_icon_view_get_pixbuf_column (GtkIconView *icon_view);
void gtk_icon_view_set_orientation (GtkIconView *icon_view,
GtkOrientation orientation);
GtkOrientation gtk_icon_view_get_orientation (GtkIconView *icon_view);
GtkTreePath * gtk_icon_view_get_path_at_pos (GtkIconView *icon_view,
gint x,
@ -96,6 +100,9 @@ void gtk_icon_view_selected_foreach (GtkIconView *icon_
void gtk_icon_view_set_selection_mode (GtkIconView *icon_view,
GtkSelectionMode mode);
GtkSelectionMode gtk_icon_view_get_selection_mode (GtkIconView *icon_view);
gboolean gtk_icon_view_get_text_beside_icon (GtkIconView *icon_view);
void gtk_icon_view_set_text_beside_icon (GtkIconView *icon_view,
gboolean text_beside_icon);
void gtk_icon_view_select_path (GtkIconView *icon_view,
GtkTreePath *path);
void gtk_icon_view_unselect_path (GtkIconView *icon_view,