AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-30 02:57:38 +00:00
Code Issues Projects Releases Wiki Activity

GtkTreeView: Avoid overlapping sort indicator

Browse Source 
Hide the sort indicator when it would overlap the column title.
This commit is contained in:
Matthias Clasen 2014-07-10 14:13:35 -04:00
parent e1112dce6d
commit 4aa649e9cd
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtktreeviewcolumn.c
View File

@ -818,6 +818,33 @@ gtk_tree_view_column_cell_layout_get_area (GtkCellLayout *cell_layout)
/* Button handling code
*/
static void
maybe_hide_arrow (GtkWidget *arrow,
GtkAllocation *allocation,
GtkTreeViewColumn *col)
{
GtkAllocation a;
gboolean overlap;
gtk_widget_get_allocation (col->priv->alignment, &a);
/* resizable columns can be shrunk all the way; in that case
* we don't want to render the sort indicator on top of the
* label, but just hide it.
*/
if ((a.x <= allocation->x && allocation->x < a.x + a.width) ||
(allocation->x <= a.x && a.x < allocation->x + allocation->width))
overlap = TRUE;
else
overlap = FALSE;
if (col->priv->show_sort_indicator && !overlap)
gtk_widget_set_opacity (arrow, 1);
else
gtk_widget_set_opacity (arrow, 0);
}
static void
gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
{
@ -878,6 +905,9 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_container_add (GTK_CONTAINER (priv->alignment), child);
gtk_container_add (GTK_CONTAINER (priv->button), hbox);
g_signal_connect (priv->arrow, "size-allocate",
G_CALLBACK (maybe_hide_arrow), tree_column);
gtk_widget_show (hbox);
gtk_widget_show (priv->alignment);
gtk_tree_view_column_update_button (tree_column);