[gtk+] GtkTreeView: Avoid overlapping sort indicator
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkTreeView: Avoid overlapping sort indicator
- Date: Thu, 10 Jul 2014 18:23:08 +0000 (UTC)
commit 4aa649e9cd9db0ae145a1ad25f63517f9baea5db
Author: Matthias Clasen <mclasen redhat com>
Date: Thu Jul 10 14:13:35 2014 -0400
GtkTreeView: Avoid overlapping sort indicator
Hide the sort indicator when it would overlap the column title.
gtk/gtktreeviewcolumn.c | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
---
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 87fc72b..af8d0b4 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -819,6 +819,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)
{
GtkTreeViewColumnPrivate *priv = tree_column->priv;
@@ -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);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]