X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtktreeview.c;h=505f41b588eca0e786c522e7b97655ae0de34240;hb=a89d420270d1a856e072ed87c365b0176f102e6c;hp=c8d08950713d985ab2b3a48a602e9c395e408dcc;hpb=a3b097639f47d9ccb914418d7e564060897f7160;p=~andy%2Fgtk
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index c8d089507..505f41b58 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -12,9 +12,7 @@
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see .
*/
@@ -24,6 +22,8 @@
#include
#include "gtktreeview.h"
+
+#include "gtkadjustment.h"
#include "gtkrbtree.h"
#include "gtktreednd.h"
#include "gtktreeprivate.h"
@@ -48,9 +48,12 @@
#include "gtkwidgetprivate.h"
#include "gtkentryprivate.h"
#include "gtkstylecontextprivate.h"
+#include "gtkcssstylepropertyprivate.h"
#include "gtktypebuiltins.h"
#include "gtkmain.h"
-#include "a11y/gtktreeviewaccessible.h"
+#include "gtksettings.h"
+#include "gtkwidgetpath.h"
+#include "a11y/gtktreeviewaccessibleprivate.h"
/**
@@ -236,7 +239,6 @@ typedef enum {
#define GTK_TREE_VIEW_PRIORITY_SCROLL_SYNC (GTK_TREE_VIEW_PRIORITY_VALIDATE + 2)
#define GTK_TREE_VIEW_TIME_MS_PER_IDLE 30
#define SCROLL_EDGE_SIZE 15
-#define EXPANDER_EXTRA_PADDING 4
#define GTK_TREE_VIEW_SEARCH_DIALOG_TIMEOUT 5000
#define AUTO_EXPAND_TIMEOUT 500
@@ -314,7 +316,6 @@ struct _GtkTreeViewPrivate
guint scroll_sync_timer;
/* Indentation and expander layout */
- gint expander_size;
GtkTreeViewColumn *expander_column;
gint level_indentation;
@@ -383,12 +384,10 @@ struct _GtkTreeViewPrivate
gint drag_pos;
gint x_drag;
- /* Non-interactive Header Resizing, expand flag support */
- gint prev_width;
-
- gint last_extra_space;
- gint last_extra_space_per_column;
- gint last_number_of_expand_columns;
+ /* Column width allocation */
+ gint minimum_width;
+ gint natural_width;
+ gint n_expand_columns;
/* ATK Hack */
GtkTreeDestroyCountFunc destroy_count_func;
@@ -462,6 +461,7 @@ struct _GtkTreeViewPrivate
guint fixed_height_mode : 1;
guint fixed_height_check : 1;
+ guint activate_on_single_click : 1;
guint reorderable : 1;
guint header_has_focus : 1;
guint drag_column_window_state : 3;
@@ -492,8 +492,6 @@ struct _GtkTreeViewPrivate
guint in_grab : 1;
- guint post_validation_flag : 1;
-
/* Whether our key press handler is to avoid sending an unhandled binding to the search entry */
guint search_entry_avoid_unhandled_binding : 1;
@@ -558,7 +556,8 @@ enum {
PROP_RUBBER_BANDING,
PROP_ENABLE_GRID_LINES,
PROP_ENABLE_TREE_LINES,
- PROP_TOOLTIP_COLUMN
+ PROP_TOOLTIP_COLUMN,
+ PROP_ACTIVATE_ON_SINGLE_CLICK
};
/* object signals */
@@ -583,9 +582,6 @@ static void gtk_tree_view_get_preferred_width (GtkWidget *widget,
static void gtk_tree_view_get_preferred_height (GtkWidget *widget,
gint *minimum,
gint *natural);
-static void gtk_tree_view_size_request (GtkWidget *widget,
- GtkRequisition *requisition,
- gboolean may_validate);
static void gtk_tree_view_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static gboolean gtk_tree_view_draw (GtkWidget *widget,
@@ -714,7 +710,7 @@ static gboolean validate_row (GtkTreeView *tree_view,
static void validate_visible_area (GtkTreeView *tree_view);
static gboolean validate_rows_handler (GtkTreeView *tree_view);
static gboolean do_validate_rows (GtkTreeView *tree_view,
- gboolean size_request);
+ gboolean queue_resize);
static gboolean validate_rows (GtkTreeView *tree_view);
static gboolean presize_handler_callback (gpointer data);
static void install_presize_handler (GtkTreeView *tree_view);
@@ -752,9 +748,6 @@ static void gtk_tree_view_get_arrow_xrange (GtkTreeView
GtkRBTree *tree,
gint *x1,
gint *x2);
-static gint gtk_tree_view_new_column_width (GtkTreeView *tree_view,
- gint i,
- gint *x);
static void gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment,
GtkTreeView *tree_view);
static void gtk_tree_view_build_tree (GtkTreeView *tree_view,
@@ -1183,6 +1176,22 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
-1,
GTK_PARAM_READWRITE));
+ /**
+ * GtkTreeView:activate-on-single-click:
+ *
+ * The activate-on-single-click property specifies whether the "row-activated" signal
+ * will be emitted after a single click.
+ *
+ * Since: 3.8
+ */
+ g_object_class_install_property (o_class,
+ PROP_ACTIVATE_ON_SINGLE_CLICK,
+ g_param_spec_boolean ("activate-on-single-click",
+ P_("Activate on Single Click"),
+ P_("Activate row on a single click"),
+ FALSE,
+ GTK_PARAM_READWRITE));
+
/* Style properties */
#define _TREE_VIEW_EXPANDER_SIZE 14
#define _TREE_VIEW_VERTICAL_SEPARATOR 2
@@ -1279,10 +1288,12 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
* @column: the #GtkTreeViewColumn in which the activation occurred
*
* The "row-activated" signal is emitted when the method
- * gtk_tree_view_row_activated() is called or the user double clicks
- * a treeview row. It is also emitted when a non-editable row is
- * selected and one of the keys: Space, Shift+Space, Return or
- * Enter is pressed.
+ * gtk_tree_view_row_activated() is called, when the user double
+ * clicks a treeview row with the "activate-on-single-click"
+ * property set to %FALSE, or when the user single clicks a row when
+ * the "activate-on-single-click" property set to %TRUE. It is also
+ * emitted when a non-editable row is selected and one of the keys:
+ * Space, Shift+Space, Return or Enter is pressed.
*
* For selection handling refer to the tree
* widget conceptual overview as well as #GtkTreeSelection.
@@ -1717,6 +1728,7 @@ gtk_tree_view_init (GtkTreeView *tree_view)
tree_view->priv->show_expanders = TRUE;
tree_view->priv->draw_keyfocus = TRUE;
tree_view->priv->headers_visible = TRUE;
+ tree_view->priv->activate_on_single_click = FALSE;
/* We need some padding */
tree_view->priv->dy = 0;
@@ -1725,6 +1737,9 @@ gtk_tree_view_init (GtkTreeView *tree_view)
tree_view->priv->header_height = 1;
tree_view->priv->x_drag = 0;
tree_view->priv->drag_pos = -1;
+ tree_view->priv->minimum_width = 0;
+ tree_view->priv->natural_width = 0;
+ tree_view->priv->n_expand_columns = 0;
tree_view->priv->header_has_focus = FALSE;
tree_view->priv->pressed_button = -1;
tree_view->priv->press_start_x = -1;
@@ -1757,8 +1772,6 @@ gtk_tree_view_init (GtkTreeView *tree_view)
tree_view->priv->tooltip_column = -1;
- tree_view->priv->post_validation_flag = FALSE;
-
tree_view->priv->last_button_x = -1;
tree_view->priv->last_button_y = -1;
@@ -1767,6 +1780,9 @@ gtk_tree_view_init (GtkTreeView *tree_view)
gtk_tree_view_do_set_vadjustment (tree_view, NULL);
gtk_tree_view_do_set_hadjustment (tree_view, NULL);
+
+ gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (tree_view)),
+ GTK_STYLE_CLASS_VIEW);
}
@@ -1851,6 +1867,9 @@ gtk_tree_view_set_property (GObject *object,
case PROP_TOOLTIP_COLUMN:
gtk_tree_view_set_tooltip_column (tree_view, g_value_get_int (value));
break;
+ case PROP_ACTIVATE_ON_SINGLE_CLICK:
+ gtk_tree_view_set_activate_on_single_click (tree_view, g_value_get_boolean (value));
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -1932,6 +1951,9 @@ gtk_tree_view_get_property (GObject *object,
case PROP_TOOLTIP_COLUMN:
g_value_set_int (value, tree_view->priv->tooltip_column);
break;
+ case PROP_ACTIVATE_ON_SINGLE_CLICK:
+ g_value_set_boolean (value, tree_view->priv->activate_on_single_click);
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -2190,11 +2212,8 @@ gtk_tree_view_ensure_background (GtkTreeView *tree_view)
context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW);
gtk_style_context_set_background (context, tree_view->priv->bin_window);
- gtk_style_context_restore (context);
-
+ gtk_style_context_set_background (context, gtk_widget_get_window (GTK_WIDGET (tree_view)));
gtk_style_context_set_background (context, tree_view->priv->header_window);
}
@@ -2227,7 +2246,7 @@ gtk_tree_view_realize (GtkWidget *widget)
window = gdk_window_new (gtk_widget_get_parent_window (widget),
&attributes, attributes_mask);
gtk_widget_set_window (widget, window);
- gdk_window_set_user_data (window, widget);
+ gtk_widget_register_window (widget, window);
gtk_widget_get_allocation (widget, &allocation);
@@ -2238,6 +2257,7 @@ gtk_tree_view_realize (GtkWidget *widget)
attributes.height = allocation.height;
attributes.event_mask = (GDK_EXPOSURE_MASK |
GDK_SCROLL_MASK |
+ GDK_SMOOTH_SCROLL_MASK |
GDK_POINTER_MOTION_MASK |
GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK |
@@ -2247,7 +2267,7 @@ gtk_tree_view_realize (GtkWidget *widget)
tree_view->priv->bin_window = gdk_window_new (window,
&attributes, attributes_mask);
- gdk_window_set_user_data (tree_view->priv->bin_window, widget);
+ gtk_widget_register_window (widget, tree_view->priv->bin_window);
gtk_widget_get_allocation (widget, &allocation);
@@ -2268,7 +2288,7 @@ gtk_tree_view_realize (GtkWidget *widget)
tree_view->priv->header_window = gdk_window_new (window,
&attributes, attributes_mask);
- gdk_window_set_user_data (tree_view->priv->header_window, widget);
+ gtk_widget_register_window (widget, tree_view->priv->header_window);
gtk_tree_view_ensure_background (tree_view);
@@ -2296,7 +2316,6 @@ gtk_tree_view_unrealize (GtkWidget *widget)
{
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
GtkTreeViewPrivate *priv = tree_view->priv;
- GtkStyleContext *context;
GList *list;
if (priv->scroll_timeout != 0)
@@ -2317,9 +2336,6 @@ gtk_tree_view_unrealize (GtkWidget *widget)
priv->open_dest_timeout = 0;
}
- context = gtk_widget_get_style_context (widget);
- gtk_style_context_cancel_animations (context, NULL);
-
if (priv->presize_handler_timer != 0)
{
g_source_remove (priv->presize_handler_timer);
@@ -2347,24 +2363,24 @@ gtk_tree_view_unrealize (GtkWidget *widget)
for (list = priv->columns; list; list = list->next)
_gtk_tree_view_column_unrealize_button (GTK_TREE_VIEW_COLUMN (list->data));
- gdk_window_set_user_data (priv->bin_window, NULL);
+ gtk_widget_unregister_window (widget, priv->bin_window);
gdk_window_destroy (priv->bin_window);
priv->bin_window = NULL;
- gdk_window_set_user_data (priv->header_window, NULL);
+ gtk_widget_unregister_window (widget, priv->header_window);
gdk_window_destroy (priv->header_window);
priv->header_window = NULL;
if (priv->drag_window)
{
- gdk_window_set_user_data (priv->drag_window, NULL);
+ gtk_widget_unregister_window (widget, priv->drag_window);
gdk_window_destroy (priv->drag_window);
priv->drag_window = NULL;
}
if (priv->drag_highlight_window)
{
- gdk_window_set_user_data (priv->drag_highlight_window, NULL);
+ gtk_widget_unregister_window (widget, priv->drag_highlight_window);
gdk_window_destroy (priv->drag_highlight_window);
priv->drag_highlight_window = NULL;
}
@@ -2372,9 +2388,9 @@ gtk_tree_view_unrealize (GtkWidget *widget)
GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->unrealize (widget);
}
-/* GtkWidget::size_request helper */
+/* GtkWidget::get_preferred_height helper */
static void
-gtk_tree_view_size_request_columns (GtkTreeView *tree_view)
+gtk_tree_view_update_height (GtkTreeView *tree_view)
{
GList *list;
@@ -2392,88 +2408,134 @@ gtk_tree_view_size_request_columns (GtkTreeView *tree_view)
gtk_widget_get_preferred_size (button, &requisition, NULL);
tree_view->priv->header_height = MAX (tree_view->priv->header_height, requisition.height);
}
-}
+ if (tree_view->priv->tree == NULL)
+ tree_view->priv->height = 0;
+ else
+ tree_view->priv->height = tree_view->priv->tree->root->offset;
+}
-/* Called only by ::size_request */
static void
-gtk_tree_view_update_size (GtkTreeView *tree_view)
+gtk_tree_view_get_preferred_width (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
+ GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
GList *list;
GtkTreeViewColumn *column;
- gint i;
-
- if (tree_view->priv->model == NULL)
- {
- tree_view->priv->width = 0;
- tree_view->priv->prev_width = 0;
- tree_view->priv->height = 0;
- return;
- }
+ gint column_minimum, column_natural;
- tree_view->priv->prev_width = tree_view->priv->width;
- tree_view->priv->width = 0;
+ /* we validate some rows initially just to make sure we have some size.
+ * In practice, with a lot of static lists, this should get a good width.
+ */
+ do_validate_rows (tree_view, FALSE);
+
+ tree_view->priv->minimum_width = 0;
+ tree_view->priv->natural_width = 0;
+ tree_view->priv->n_expand_columns = 0;
/* keep this in sync with size_allocate below */
- for (list = tree_view->priv->columns, i = 0; list; list = list->next, i++)
+ for (list = tree_view->priv->columns; list; list = list->next)
{
column = list->data;
- if (!gtk_tree_view_column_get_visible (column))
+ if (!gtk_tree_view_column_get_visible (column) || column == tree_view->priv->drag_column)
continue;
- tree_view->priv->width += _gtk_tree_view_column_request_width (column);
+ _gtk_tree_view_column_request_width (column, &column_minimum, &column_natural);
+ tree_view->priv->minimum_width += column_minimum;
+ tree_view->priv->natural_width += column_natural;
+
+ if (gtk_tree_view_column_get_expand (column))
+ tree_view->priv->n_expand_columns++;
}
- if (tree_view->priv->tree == NULL)
- tree_view->priv->height = 0;
- else
- tree_view->priv->height = tree_view->priv->tree->root->offset;
+ if (minimum != NULL)
+ *minimum = tree_view->priv->minimum_width;
+ if (natural != NULL)
+ *natural = tree_view->priv->natural_width;
}
static void
-gtk_tree_view_size_request (GtkWidget *widget,
- GtkRequisition *requisition,
- gboolean may_validate)
+gtk_tree_view_get_preferred_height (GtkWidget *widget,
+ gint *minimum,
+ gint *natural)
{
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
+ gint height;
- if (may_validate)
- {
- /* we validate some rows initially just to make sure we have some size.
- * In practice, with a lot of static lists, this should get a good width.
- */
- do_validate_rows (tree_view, FALSE);
- }
+ gtk_tree_view_update_height (tree_view);
- gtk_tree_view_size_request_columns (tree_view);
- gtk_tree_view_update_size (GTK_TREE_VIEW (widget));
+ height = tree_view->priv->height + gtk_tree_view_get_effective_header_height (tree_view);
- requisition->width = tree_view->priv->width;
- requisition->height = tree_view->priv->height + gtk_tree_view_get_effective_header_height (tree_view);
+ if (minimum != NULL)
+ *minimum = height;
+ if (natural != NULL)
+ *natural = height;
}
static void
-gtk_tree_view_get_preferred_width (GtkWidget *widget,
- gint *minimum,
- gint *natural)
+gtk_tree_view_modify_column_width (GtkTreeView *tree_view,
+ GtkTreeViewColumn *column,
+ gint width)
{
- GtkRequisition requisition;
+ gboolean is_expand;
+ gint n_expand_others;
+ gint minimum, natural, natural_others;
+ gint expand;
- gtk_tree_view_size_request (widget, &requisition, TRUE);
+ is_expand = gtk_tree_view_column_get_expand (column);
+ n_expand_others = tree_view->priv->n_expand_columns - (is_expand ? 1 : 0);
- *minimum = *natural = requisition.width;
-}
+ _gtk_tree_view_column_request_width (column, &minimum, &natural);
+ natural_others = tree_view->priv->natural_width - natural;
-static void
-gtk_tree_view_get_preferred_height (GtkWidget *widget,
- gint *minimum,
- gint *natural)
-{
- GtkRequisition requisition;
+ if (natural_others + width < tree_view->priv->width)
+ {
+ /* There is extra space that needs to be taken up by letting some other
+ * column(s) expand: by default, the last column. */
+ if (!n_expand_others)
+ {
+ GList *last = g_list_last (tree_view->priv->columns);
+ while (!gtk_tree_view_column_get_visible (last->data))
+ last = last->prev;
+
+ if (column == last->data)
+ return;
- gtk_tree_view_size_request (widget, &requisition, TRUE);
+ gtk_tree_view_column_set_expand (last->data, TRUE);
+ n_expand_others++;
+ }
+
+ /* Now try to make this column expandable also. Solving the following
+ * equations reveals what the natural width should be to achieve the
+ * desired width after expanding:
+ *
+ * 1. natural + expand = desired_width
+ * 2. natural + natural_others + expand * (n_expand_others + 1) = total_width
+ *
+ * Solution:
+ * expand = (total_width - natural_others - desired_width) / n_expand_others
+ *
+ * It is possible for the solved natural width to be less than the
+ * minimum; in that case, we cannot let the column expand.
+ */
+ expand = (tree_view->priv->width - natural_others - width) / n_expand_others;
- *minimum = *natural = requisition.height;
+ if (minimum + expand > width)
+ {
+ if (is_expand)
+ gtk_tree_view_column_set_expand (column, FALSE);
+ }
+ else
+ {
+ if (!is_expand)
+ gtk_tree_view_column_set_expand (column, TRUE);
+
+ width -= expand;
+ }
+ }
+
+ gtk_tree_view_column_set_fixed_width (column, width);
}
static int
@@ -2505,12 +2567,9 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget,
GList *list, *first_column, *last_column;
GtkTreeViewColumn *column;
GtkAllocation widget_allocation;
- gint width = 0;
- gint extra, extra_per_column, extra_for_last;
- gint full_requested_width = 0;
- gint number_of_expand_columns = 0;
+ gint minimum_width, natural_width, n_expand_columns, width;
+ gint column_minimum, column_natural, column_width;
gboolean rtl;
- gboolean update_expand;
tree_view = GTK_TREE_VIEW (widget);
@@ -2530,133 +2589,88 @@ gtk_tree_view_size_allocate_columns (GtkWidget *widget,
rtl = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL);
- /* find out how many extra space and expandable columns we have */
- for (list = tree_view->priv->columns; list != last_column->next; list = list->next)
- {
- column = (GtkTreeViewColumn *)list->data;
-
- if (!gtk_tree_view_column_get_visible (column))
- continue;
-
- full_requested_width += _gtk_tree_view_column_request_width (column);
-
- if (gtk_tree_view_column_get_expand (column))
- number_of_expand_columns++;
- }
-
- /* Only update the expand value if the width of the widget has changed,
- * or the number of expand columns has changed, or if there are no expand
- * columns, or if we didn't have an size-allocation yet after the
- * last validated node.
- */
- update_expand = (width_changed && *width_changed == TRUE)
- || number_of_expand_columns != tree_view->priv->last_number_of_expand_columns
- || number_of_expand_columns == 0
- || tree_view->priv->post_validation_flag == TRUE;
-
- tree_view->priv->post_validation_flag = FALSE;
-
gtk_widget_get_allocation (widget, &widget_allocation);
- if (!update_expand)
- {
- extra = tree_view->priv->last_extra_space;
- extra_for_last = MAX (widget_allocation.width - full_requested_width - extra, 0);
- }
- else
- {
- extra = MAX (widget_allocation.width - full_requested_width, 0);
- extra_for_last = 0;
- tree_view->priv->last_extra_space = extra;
- }
+ minimum_width = tree_view->priv->minimum_width;
+ natural_width = tree_view->priv->natural_width;
+ n_expand_columns = tree_view->priv->n_expand_columns;
- if (number_of_expand_columns > 0)
- extra_per_column = extra/number_of_expand_columns;
- else
- extra_per_column = 0;
+ width = MAX (widget_allocation.width, minimum_width);
- if (update_expand)
+ /* We change the width here. The user might have been resizing columns,
+ * which changes the total width of the tree view. This is of
+ * importance for getting the horizontal scroll bar right.
+ */
+ if (tree_view->priv->width != width)
{
- tree_view->priv->last_extra_space_per_column = extra_per_column;
- tree_view->priv->last_number_of_expand_columns = number_of_expand_columns;
+ tree_view->priv->width = width;
+ if (width_changed)
+ *width_changed = TRUE;
}
- for (list = (rtl ? last_column : first_column);
- list != (rtl ? first_column->prev : last_column->next);
- list = (rtl ? list->prev : list->next))
+ /* iterate through columns in reverse order */
+ for (list = (rtl ? first_column : last_column);
+ list != (rtl ? last_column->next : first_column->prev);
+ list = (rtl ? list->next : list->prev))
{
- gint column_width;
-
column = list->data;
- if (!gtk_tree_view_column_get_visible (column))
+ if (!gtk_tree_view_column_get_visible (column) || column == tree_view->priv->drag_column)
continue;
- /* We need to handle the dragged button specially.
- */
- if (column == tree_view->priv->drag_column)
- {
- GtkAllocation drag_allocation;
- GtkWidget *button;
-
- button = gtk_tree_view_column_get_button (tree_view->priv->drag_column);
-
- drag_allocation.x = 0;
- drag_allocation.y = 0;
- drag_allocation.width = gdk_window_get_width (tree_view->priv->drag_window);
- drag_allocation.height = gdk_window_get_height (tree_view->priv->drag_window);
- gtk_widget_size_allocate (button, &drag_allocation);
- width += drag_allocation.width;
- continue;
- }
-
- column_width = _gtk_tree_view_column_request_width (column);
+ _gtk_tree_view_column_request_width (column, &column_minimum, &column_natural);
+
+ column_width = column_natural;
- if (gtk_tree_view_column_get_expand (column))
- {
- if (number_of_expand_columns == 1)
+ if (width > natural_width)
+ {
+ /* We need to expand some columns. If there are none marked to
+ * expand, give all the extra space to the last column. */
+ if (n_expand_columns == 0)
{
- /* We add the remander to the last column as
- * */
- column_width += extra;
+ column_width = column_natural + (width - natural_width);
}
- else
+ else if (gtk_tree_view_column_get_expand (column))
{
- column_width += extra_per_column;
- extra -= extra_per_column;
- number_of_expand_columns --;
+ column_width = column_natural + (width - natural_width) / n_expand_columns;
+ n_expand_columns--;
}
- }
- else if (number_of_expand_columns == 0 &&
- list == last_column)
+ }
+ else if (width < natural_width)
{
- column_width += extra;
+ /* We need to shrink some columns. Starting with later columns,
+ * shrink each one down to its minimum width as necessary. */
+ column_width = MAX (column_natural + (width - natural_width), column_minimum);
}
+
+ _gtk_tree_view_column_allocate (column, width - column_width, column_width);
+
+ minimum_width -= column_minimum;
+ natural_width -= column_natural;
+ width -= column_width;
+ }
+}
- /* In addition to expand, the last column can get even more
- * extra space so all available space is filled up.
- */
- if (extra_for_last > 0 && list == last_column)
- column_width += extra_for_last;
+/* GtkWidget::size_allocate helper */
+static void
+gtk_tree_view_size_allocate_drag_column (GtkWidget *widget)
+{
+ GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
+ GtkAllocation drag_allocation;
+ GtkWidget *button;
- _gtk_tree_view_column_allocate (column, width, column_width);
+ if (tree_view->priv->drag_column == NULL)
+ return;
- width += column_width;
- }
+ button = gtk_tree_view_column_get_button (tree_view->priv->drag_column);
- /* We change the width here. The user might have been resizing columns,
- * which changes the total width of the tree view. This is of
- * importance for getting the horizontal scroll bar right.
- */
- if (tree_view->priv->width != width)
- {
- tree_view->priv->width = width;
- if (width_changed)
- *width_changed = TRUE;
- }
+ drag_allocation.x = 0;
+ drag_allocation.y = 0;
+ drag_allocation.width = gdk_window_get_width (tree_view->priv->drag_window);
+ drag_allocation.height = gdk_window_get_height (tree_view->priv->drag_window);
+ gtk_widget_size_allocate (button, &drag_allocation);
}
-
static void
gtk_tree_view_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
@@ -2695,6 +2709,7 @@ gtk_tree_view_size_allocate (GtkWidget *widget,
* tree view (used in updating the adjustments below) might change.
*/
gtk_tree_view_size_allocate_columns (widget, &width_changed);
+ gtk_tree_view_size_allocate_drag_column (widget);
g_object_freeze_notify (G_OBJECT (tree_view->priv->hadjustment));
gtk_adjustment_set_page_size (tree_view->priv->hadjustment,
@@ -2727,11 +2742,6 @@ gtk_tree_view_size_allocate (GtkWidget *widget,
0,
tree_view->priv->width - allocation->width));
}
- else
- gtk_adjustment_set_value (tree_view->priv->hadjustment,
- CLAMP (tree_view->priv->width - (tree_view->priv->prev_width - gtk_adjustment_get_value (tree_view->priv->hadjustment)),
- 0,
- tree_view->priv->width - allocation->width));
}
else
{
@@ -2850,6 +2860,20 @@ row_is_separator (GtkTreeView *tree_view,
return is_separator;
}
+static int
+gtk_tree_view_get_expander_size (GtkTreeView *tree_view)
+{
+ gint expander_size;
+ gint horizontal_separator;
+
+ gtk_widget_style_get (GTK_WIDGET (tree_view),
+ "expander-size", &expander_size,
+ "horizontal-separator", &horizontal_separator,
+ NULL);
+
+ return expander_size + (horizontal_separator / 2);
+}
+
static gboolean
gtk_tree_view_button_press (GtkWidget *widget,
GdkEventButton *event)
@@ -2872,6 +2896,10 @@ gtk_tree_view_button_press (GtkWidget *widget,
"horizontal-separator", &horizontal_separator,
NULL);
+ /* Don't handle extra mouse buttons events, let them bubble up */
+ if (event->button > 5)
+ return FALSE;
+
/* Because grab_focus can cause reentrancy, we delay grab_focus until after
* we're done handling the button press.
*/
@@ -2983,9 +3011,10 @@ gtk_tree_view_button_press (GtkWidget *widget,
if (gtk_tree_view_draw_expanders (tree_view))
{
+ gint expander_size = gtk_tree_view_get_expander_size (tree_view);
if (!rtl)
- cell_area.x += depth * tree_view->priv->expander_size;
- cell_area.width -= depth * tree_view->priv->expander_size;
+ cell_area.x += depth * expander_size;
+ cell_area.width -= depth * expander_size;
}
}
break;
@@ -3137,38 +3166,47 @@ gtk_tree_view_button_press (GtkWidget *widget,
}
}
- /* Test if a double click happened on the same row. */
if (event->button == GDK_BUTTON_PRIMARY && event->type == GDK_BUTTON_PRESS)
{
- int double_click_time, double_click_distance;
-
- g_object_get (gtk_settings_get_default (),
- "gtk-double-click-time", &double_click_time,
- "gtk-double-click-distance", &double_click_distance,
- NULL);
- /* Same conditions as _gdk_event_button_generate */
- if (tree_view->priv->last_button_x != -1 &&
- (event->time < tree_view->priv->last_button_time + double_click_time) &&
- (ABS (event->x - tree_view->priv->last_button_x) <= double_click_distance) &&
- (ABS (event->y - tree_view->priv->last_button_y) <= double_click_distance))
+ /* Test if a double click happened on the same row. */
+ if (!tree_view->priv->activate_on_single_click)
{
- /* We do no longer compare paths of this row and the
- * row clicked previously. We use the double click
- * distance to decide whether this is a valid click,
- * allowing the mouse to slightly move over another row.
- */
- row_double_click = TRUE;
-
- tree_view->priv->last_button_time = 0;
- tree_view->priv->last_button_x = -1;
- tree_view->priv->last_button_y = -1;
+ int double_click_time, double_click_distance;
+
+ g_object_get (gtk_settings_get_default (),
+ "gtk-double-click-time", &double_click_time,
+ "gtk-double-click-distance", &double_click_distance,
+ NULL);
+
+ /* Same conditions as _gdk_event_button_generate */
+ if (tree_view->priv->last_button_x != -1 &&
+ (event->time < tree_view->priv->last_button_time + double_click_time) &&
+ (ABS (event->x - tree_view->priv->last_button_x) <= double_click_distance) &&
+ (ABS (event->y - tree_view->priv->last_button_y) <= double_click_distance))
+ {
+ /* We do no longer compare paths of this row and the
+ * row clicked previously. We use the double click
+ * distance to decide whether this is a valid click,
+ * allowing the mouse to slightly move over another row.
+ */
+ row_double_click = TRUE;
+
+ tree_view->priv->last_button_time = 0;
+ tree_view->priv->last_button_x = -1;
+ tree_view->priv->last_button_y = -1;
+ }
+ else
+ {
+ tree_view->priv->last_button_time = event->time;
+ tree_view->priv->last_button_x = event->x;
+ tree_view->priv->last_button_y = event->y;
+ }
}
else
{
- tree_view->priv->last_button_time = event->time;
- tree_view->priv->last_button_x = event->x;
- tree_view->priv->last_button_y = event->y;
+ tree_view->priv->button_pressed_node = tree_view->priv->prelight_node;
+ tree_view->priv->button_pressed_tree = tree_view->priv->prelight_tree;
}
}
@@ -3202,11 +3240,13 @@ gtk_tree_view_button_press (GtkWidget *widget,
_gtk_tree_view_column_get_window (column))
{
gpointer drag_data;
+ gint column_width, x;
if (event->type == GDK_2BUTTON_PRESS &&
gtk_tree_view_column_get_sizing (column) != GTK_TREE_VIEW_COLUMN_AUTOSIZE)
{
- _gtk_tree_view_column_set_use_resized_width (column, FALSE);
+ gtk_tree_view_column_set_fixed_width (column, -1);
+ gtk_tree_view_column_set_expand (column, FALSE);
_gtk_tree_view_column_autosize (tree_view, column);
return TRUE;
}
@@ -3225,9 +3265,6 @@ gtk_tree_view_button_press (GtkWidget *widget,
gtk_grab_add (widget);
tree_view->priv->in_column_resize = TRUE;
- _gtk_tree_view_column_set_resized_width (column, gtk_tree_view_column_get_width (column) -
- tree_view->priv->last_extra_space_per_column);
-
/* block attached dnd signal handler */
drag_data = g_object_get_data (G_OBJECT (widget), "gtk-site-data");
if (drag_data)
@@ -3236,8 +3273,13 @@ gtk_tree_view_button_press (GtkWidget *widget,
0, 0, NULL, NULL,
drag_data);
+ column_width = gtk_tree_view_column_get_width (column);
+ gdk_window_get_device_position (tree_view->priv->bin_window,
+ gdk_event_get_device ((GdkEvent *) event),
+ &x, NULL, NULL);
+
tree_view->priv->drag_pos = i;
- tree_view->priv->x_drag = gtk_tree_view_column_get_x_offset (column) + (rtl ? 0 : gtk_tree_view_column_get_width (column));
+ tree_view->priv->x_drag = x + (rtl ? column_width : -column_width);
if (!gtk_widget_has_focus (widget))
gtk_widget_grab_focus (widget);
@@ -3258,6 +3300,7 @@ gtk_tree_view_button_release_drag_column (GtkWidget *widget,
GList *l;
gboolean rtl;
GdkDevice *device, *other;
+ GtkStyleContext *context;
tree_view = GTK_TREE_VIEW (widget);
@@ -3269,6 +3312,10 @@ gtk_tree_view_button_release_drag_column (GtkWidget *widget,
/* Move the button back */
button = gtk_tree_view_column_get_button (tree_view->priv->drag_column);
+
+ context = gtk_widget_get_style_context (button);
+ gtk_style_context_remove_class (context, GTK_STYLE_CLASS_DND);
+
g_object_ref (button);
gtk_container_remove (GTK_CONTAINER (tree_view), button);
gtk_widget_set_parent_window (button, tree_view->priv->header_window);
@@ -3300,7 +3347,9 @@ gtk_tree_view_button_release_drag_column (GtkWidget *widget,
tree_view->priv->cur_reorder->left_column);
}
tree_view->priv->drag_column = NULL;
- gdk_window_hide (tree_view->priv->drag_window);
+ gtk_widget_unregister_window (widget, tree_view->priv->drag_window);
+ gdk_window_destroy (tree_view->priv->drag_window);
+ tree_view->priv->drag_window = NULL;
for (l = tree_view->priv->column_drag_info; l != NULL; l = l->next)
g_slice_free (GtkTreeViewColumnReorder, l->data);
@@ -3344,6 +3393,12 @@ gtk_tree_view_button_release_column_resize (GtkWidget *widget,
return TRUE;
}
+static gboolean
+button_event_modifies_selection (GdkEventButton *event)
+{
+ return (event->state & (GDK_CONTROL_MASK | GDK_SHIFT_MASK)) != 0;
+}
+
static gboolean
gtk_tree_view_button_release (GtkWidget *widget,
GdkEventButton *event)
@@ -3365,10 +3420,10 @@ gtk_tree_view_button_release (GtkWidget *widget,
if (tree_view->priv->button_pressed_node == NULL)
return FALSE;
- if (event->button == GDK_BUTTON_PRIMARY)
+ if (event->button == GDK_BUTTON_PRIMARY
+ && tree_view->priv->button_pressed_node == tree_view->priv->prelight_node)
{
- if (tree_view->priv->button_pressed_node == tree_view->priv->prelight_node &&
- tree_view->priv->arrow_prelit)
+ if (tree_view->priv->arrow_prelit)
{
GtkTreePath *path = NULL;
@@ -3386,6 +3441,16 @@ gtk_tree_view_button_release (GtkWidget *widget,
tree_view->priv->button_pressed_node, TRUE);
gtk_tree_path_free (path);
}
+ else if (tree_view->priv->activate_on_single_click
+ && !button_event_modifies_selection (event))
+ {
+ GtkTreePath *path = NULL;
+
+ path = _gtk_tree_path_new_from_rbtree (tree_view->priv->button_pressed_tree,
+ tree_view->priv->button_pressed_node);
+ gtk_tree_view_row_activated (tree_view, path, tree_view->priv->focus_column);
+ gtk_tree_path_free (path);
+ }
gtk_grab_remove (widget);
tree_view->priv->button_pressed_tree = NULL;
@@ -3743,8 +3808,7 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
if (tree_view->priv->drag_highlight_window)
{
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window,
- NULL);
+ gtk_widget_unregister_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
gdk_window_destroy (tree_view->priv->drag_highlight_window);
}
@@ -3760,7 +3824,7 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
tree_view->priv->drag_highlight_window = gdk_window_new (tree_view->priv->header_window, &attributes, attributes_mask);
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+ gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
mask_image = cairo_image_surface_create (CAIRO_FORMAT_A1, width, height);
cr = cairo_create (mask_image);
@@ -3784,7 +3848,7 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
GtkAllocation button_allocation;
GtkWidget *button;
- width = tree_view->priv->expander_size;
+ width = gtk_tree_view_get_expander_size (tree_view);
/* Get x, y, width, height of arrow */
gdk_window_get_origin (tree_view->priv->header_window, &x, &y);
@@ -3802,16 +3866,15 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
x += button_allocation.x - width/2;
height = button_allocation.height;
}
- y -= tree_view->priv->expander_size/2; /* The arrow takes up only half the space */
- height += tree_view->priv->expander_size;
+ y -= width/2; /* The arrow takes up only half the space */
+ height += width;
/* Create the new window */
if (tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ARROW)
{
if (tree_view->priv->drag_highlight_window)
{
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window,
- NULL);
+ gtk_widget_unregister_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
gdk_window_destroy (tree_view->priv->drag_highlight_window);
}
@@ -3826,7 +3889,7 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
attributes.height = height;
tree_view->priv->drag_highlight_window = gdk_window_new (gtk_widget_get_root_window (widget),
&attributes, attributes_mask);
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+ gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
mask_image = cairo_image_surface_create (CAIRO_FORMAT_A1, width, height);
@@ -3856,11 +3919,12 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
{
GtkAllocation allocation;
GtkWidget *button;
+ gint expander_size;
- width = tree_view->priv->expander_size;
+ expander_size = gtk_tree_view_get_expander_size (tree_view);
/* Get x, y, width, height of arrow */
- width = width/2; /* remember, the arrow only takes half the available width */
+ width = expander_size/2; /* remember, the arrow only takes half the available width */
gdk_window_get_origin (gtk_widget_get_window (widget),
&x, &y);
if (arrow_type == DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT)
@@ -3882,8 +3946,8 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
height = allocation.height;
}
- y -= tree_view->priv->expander_size;
- height += 2*tree_view->priv->expander_size;
+ y -= expander_size;
+ height += 2 * expander_size;
/* Create the new window */
if (tree_view->priv->drag_column_window_state != DRAG_COLUMN_WINDOW_STATE_ARROW_LEFT &&
@@ -3891,8 +3955,7 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
{
if (tree_view->priv->drag_highlight_window)
{
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window,
- NULL);
+ gtk_widget_unregister_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
gdk_window_destroy (tree_view->priv->drag_highlight_window);
}
@@ -3905,8 +3968,8 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
attributes.y = y;
attributes.width = width;
attributes.height = height;
- tree_view->priv->drag_highlight_window = gdk_window_new (NULL, &attributes, attributes_mask);
- gdk_window_set_user_data (tree_view->priv->drag_highlight_window, GTK_WIDGET (tree_view));
+ tree_view->priv->drag_highlight_window = gdk_window_new (gtk_widget_get_root_window (widget), &attributes, attributes_mask);
+ gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_highlight_window);
mask_image = cairo_image_surface_create (CAIRO_FORMAT_A1, width, height);
@@ -3919,10 +3982,10 @@ gtk_tree_view_motion_draw_column_motion_arrow (GtkTreeView *tree_view)
}
cairo_move_to (cr, 0, 0);
cairo_line_to (cr, width, width);
- cairo_line_to (cr, 0, tree_view->priv->expander_size);
+ cairo_line_to (cr, 0, expander_size);
cairo_move_to (cr, 0, height);
cairo_line_to (cr, width, height - width);
- cairo_line_to (cr, 0, height - tree_view->priv->expander_size);
+ cairo_line_to (cr, 0, height - expander_size);
cairo_fill (cr);
cairo_destroy (cr);
@@ -3959,31 +4022,17 @@ gtk_tree_view_motion_resize_column (GtkWidget *widget,
column = gtk_tree_view_get_column (tree_view, tree_view->priv->drag_pos);
- if (event->is_hint || event->window != gtk_widget_get_window (widget))
- gdk_window_get_device_position (gtk_widget_get_window (widget),
- gdk_event_get_device ((GdkEvent *) event),
- &x, NULL, NULL);
- else
- x = event->x;
-
- if (tree_view->priv->hadjustment)
- x += gtk_adjustment_get_value (tree_view->priv->hadjustment);
-
- new_width = gtk_tree_view_new_column_width (tree_view,
- tree_view->priv->drag_pos, &x);
- if (x != tree_view->priv->x_drag &&
- (new_width != gtk_tree_view_column_get_fixed_width (column)))
- {
- _gtk_tree_view_column_set_use_resized_width (column, TRUE);
-
- if (gtk_tree_view_column_get_expand (column))
- new_width -= tree_view->priv->last_extra_space_per_column;
-
- _gtk_tree_view_column_set_resized_width (column, new_width);
+ gdk_window_get_device_position (tree_view->priv->bin_window,
+ gdk_event_get_device ((GdkEvent *) event),
+ &x, NULL, NULL);
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ new_width = MAX (tree_view->priv->x_drag - x, 0);
+ else
+ new_width = MAX (x - tree_view->priv->x_drag, 0);
- gtk_widget_queue_resize (widget);
- }
+ if (new_width != gtk_tree_view_column_get_width (column))
+ gtk_tree_view_modify_column_width (tree_view, column, new_width);
return FALSE;
}
@@ -4693,12 +4742,12 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
GList *first_column, *last_column;
gint vertical_separator;
gint horizontal_separator;
- gint focus_line_width;
gboolean allow_rules;
gboolean has_can_focus_cell;
gboolean rtl;
gint n_visible_columns;
gint grid_line_width;
+ gint expander_size;
gboolean draw_vgrid_lines, draw_hgrid_lines;
GtkStyleContext *context;
gboolean parity;
@@ -4710,7 +4759,6 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
"horizontal-separator", &horizontal_separator,
"vertical-separator", &vertical_separator,
"allow-rules", &allow_rules,
- "focus-line-width", &focus_line_width,
NULL);
if (tree_view->priv->tree == NULL)
@@ -4771,6 +4819,7 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
draw_hgrid_lines =
tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_HORIZONTAL
|| tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_BOTH;
+ expander_size = gtk_tree_view_get_expander_size (tree_view);
if (draw_vgrid_lines || draw_hgrid_lines)
gtk_widget_style_get (widget, "grid-line-width", &grid_line_width, NULL);
@@ -5007,9 +5056,10 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
if (gtk_tree_view_draw_expanders (tree_view))
{
+ int expander_size = gtk_tree_view_get_expander_size (tree_view);
if (!rtl)
- cell_area.x += depth * tree_view->priv->expander_size;
- cell_area.width -= depth * tree_view->priv->expander_size;
+ cell_area.x += depth * expander_size;
+ cell_area.width -= depth * expander_size;
}
/* If we have an expander column, the highlight underline
@@ -5109,18 +5159,18 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
{
gtk_tree_view_draw_line (tree_view, cr,
GTK_TREE_VIEW_TREE_LINE,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y1,
- x + tree_view->priv->expander_size * (depth - 1.1) * mult,
+ x + expander_size * (depth - 1.1) * mult,
y1);
}
else if (depth > 1)
{
gtk_tree_view_draw_line (tree_view, cr,
GTK_TREE_VIEW_TREE_LINE,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y1,
- x + tree_view->priv->expander_size * (depth - 0.5) * mult,
+ x + expander_size * (depth - 0.5) * mult,
y1);
}
@@ -5133,16 +5183,16 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
if (!_gtk_rbtree_next (tree, node))
gtk_tree_view_draw_line (tree_view, cr,
GTK_TREE_VIEW_TREE_LINE,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y0,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y1);
else
gtk_tree_view_draw_line (tree_view, cr,
GTK_TREE_VIEW_TREE_LINE,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y0,
- x + tree_view->priv->expander_size * (depth - 1.5) * mult,
+ x + expander_size * (depth - 1.5) * mult,
y2);
tmp_node = tree->parent_node;
@@ -5153,9 +5203,9 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
if (_gtk_rbtree_next (tmp_tree, tmp_node))
gtk_tree_view_draw_line (tree_view, cr,
GTK_TREE_VIEW_TREE_LINE,
- x + tree_view->priv->expander_size * (i - 0.5) * mult,
+ x + expander_size * (i - 0.5) * mult,
y0,
- x + tree_view->priv->expander_size * (i - 0.5) * mult,
+ x + expander_size * (i - 0.5) * mult,
y2);
tmp_node = tmp_tree->parent_node;
@@ -5198,12 +5248,10 @@ gtk_tree_view_bin_draw (GtkWidget *widget,
if (tree == NULL)
break;
- gtk_render_focus (context, cr,
- 0, gtk_tree_view_get_row_y_offset (tree_view, tree, node)
- - focus_line_width / 2,
- gdk_window_get_width (tree_view->priv->bin_window),
- gtk_tree_view_get_row_height (tree_view, node)
- - focus_line_width + 1);
+ gtk_render_frame (context, cr,
+ 0, gtk_tree_view_get_row_y_offset (tree_view, tree, node),
+ gdk_window_get_width (tree_view->priv->bin_window),
+ gtk_tree_view_get_row_height (tree_view, node));
break;
}
@@ -5326,24 +5374,23 @@ gtk_tree_view_draw (GtkWidget *widget,
{
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
GtkWidget *button;
+ GtkStyleContext *context;
+
+ context = gtk_widget_get_style_context (widget);
+ gtk_render_background (context, cr,
+ 0, 0,
+ gtk_widget_get_allocated_width (widget),
+ gtk_widget_get_allocated_height (widget));
if (gtk_cairo_should_draw_window (cr, tree_view->priv->bin_window))
{
- GtkStyleContext *context;
GList *tmp_list;
- context = gtk_widget_get_style_context (widget);
-
cairo_save (cr);
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW);
-
gtk_cairo_transform_to_window (cr, widget, tree_view->priv->bin_window);
-
gtk_tree_view_bin_draw (widget, cr);
- gtk_style_context_restore (context);
cairo_restore (cr);
/* We can't just chain up to Container::draw as it will try to send the
@@ -5360,6 +5407,9 @@ gtk_tree_view_draw (GtkWidget *widget,
}
}
+ gtk_style_context_save (context);
+ gtk_style_context_remove_class (context, GTK_STYLE_CLASS_VIEW);
+
if (gtk_cairo_should_draw_window (cr, tree_view->priv->header_window))
{
GList *list;
@@ -5388,6 +5438,8 @@ gtk_tree_view_draw (GtkWidget *widget,
button, cr);
}
+ gtk_style_context_restore (context);
+
return FALSE;
}
@@ -5654,7 +5706,7 @@ gtk_tree_view_key_press (GtkWidget *widget,
|| event->keyval == GDK_KEY_Right || event->keyval == GDK_KEY_KP_Right))
{
GtkTreeViewColumn *column = GTK_TREE_VIEW_COLUMN (focus_column->data);
- gint max_width, min_width;
+ gint column_width;
if (!gtk_tree_view_column_get_resizable (column))
{
@@ -5662,70 +5714,20 @@ gtk_tree_view_key_press (GtkWidget *widget,
return TRUE;
}
+ column_width = gtk_tree_view_column_get_width (column);
+
if (event->keyval == (rtl ? GDK_KEY_Right : GDK_KEY_Left)
|| event->keyval == (rtl ? GDK_KEY_KP_Right : GDK_KEY_KP_Left))
{
- GtkRequisition button_req;
- gint old_width = _gtk_tree_view_column_get_resized_width (column);
- gint new_width;
-
- button = gtk_tree_view_column_get_button (column);
-
- gtk_widget_get_preferred_size (button, &button_req, NULL);
-
- new_width = MAX (old_width, gtk_tree_view_column_get_width (column));
- new_width -= 2;
- if (new_width < 0)
- new_width = 0;
-
- _gtk_tree_view_column_set_resized_width (column, new_width);
-
- min_width = gtk_tree_view_column_get_min_width (column);
- if (min_width == -1)
- new_width = MAX (button_req.width, new_width);
- else
- {
- new_width = MAX (min_width, new_width);
- }
-
- max_width = gtk_tree_view_column_get_max_width (column);
- if (max_width != -1)
- new_width = MIN (new_width, max_width);
-
- _gtk_tree_view_column_set_use_resized_width (column, TRUE);
-
- if (new_width != old_width)
- {
- _gtk_tree_view_column_set_resized_width (column, new_width);
- gtk_widget_queue_resize (widget);
- }
- else
- gtk_widget_error_bell (widget);
+ column_width = MAX (column_width - 2, 0);
}
else if (event->keyval == (rtl ? GDK_KEY_Left : GDK_KEY_Right)
|| event->keyval == (rtl ? GDK_KEY_KP_Left : GDK_KEY_KP_Right))
{
- gint old_width = _gtk_tree_view_column_get_resized_width (column);
- gint new_width;
-
- new_width = MAX (old_width, gtk_tree_view_column_get_width (column));
- new_width += 2;
-
- max_width = gtk_tree_view_column_get_max_width (column);
- if (max_width != -1)
- new_width = MIN (new_width, max_width);
-
- _gtk_tree_view_column_set_use_resized_width (column, TRUE);
-
- if (new_width != old_width)
- {
- _gtk_tree_view_column_set_resized_width (column, new_width);
- gtk_widget_queue_resize (widget);
- }
- else
- gtk_widget_error_bell (widget);
+ column_width = column_width + 2;
}
+ gtk_tree_view_modify_column_width (tree_view, column, column_width);
return TRUE;
}
@@ -6027,6 +6029,7 @@ validate_row (GtkTreeView *tree_view,
gint grid_line_width;
gboolean wide_separators;
gint separator_height;
+ gint expander_size;
/* double check the row needs validating */
if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_INVALID) &&
@@ -6050,6 +6053,7 @@ validate_row (GtkTreeView *tree_view,
draw_hgrid_lines =
tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_HORIZONTAL
|| tree_view->priv->grid_lines == GTK_TREE_VIEW_GRID_LINES_BOTH;
+ expander_size = gtk_tree_view_get_expander_size (tree_view);
for (last_column = g_list_last (tree_view->priv->columns);
last_column &&
@@ -6092,7 +6096,7 @@ validate_row (GtkTreeView *tree_view,
{
row_height += vertical_separator;
height = MAX (height, row_height);
- height = MAX (height, tree_view->priv->expander_size);
+ height = MAX (height, expander_size);
}
else
{
@@ -6107,7 +6111,7 @@ validate_row (GtkTreeView *tree_view,
padding += horizontal_separator + (depth - 1) * tree_view->priv->level_indentation;
if (gtk_tree_view_draw_expanders (tree_view))
- padding += depth * tree_view->priv->expander_size;
+ padding += depth * expander_size;
}
else
padding += horizontal_separator;
@@ -6137,7 +6141,6 @@ validate_row (GtkTreeView *tree_view,
_gtk_rbtree_node_set_height (tree, node, height);
}
_gtk_rbtree_node_mark_valid (tree, node);
- tree_view->priv->post_validation_flag = TRUE;
return retval;
}
@@ -6552,6 +6555,8 @@ initialize_fixed_height_mode (GtkTreeView *tree_view)
static gboolean
do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
{
+ static gboolean prevent_recursion_hack = FALSE;
+
GtkRBTree *tree = NULL;
GtkRBNode *node = NULL;
gboolean validated_area = FALSE;
@@ -6567,6 +6572,10 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
g_assert (tree_view);
+ /* prevent infinite recursion via get_preferred_width() */
+ if (prevent_recursion_hack)
+ return FALSE;
+
if (tree_view->priv->tree == NULL)
return FALSE;
@@ -6697,7 +6706,10 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
* Currently bypassing this but the real solution is to not update the scroll adjustments
* untill we've recieved an allocation (never update scroll adjustments from size-requests).
*/
- gtk_tree_view_size_request (GTK_WIDGET (tree_view), &requisition, FALSE);
+ prevent_recursion_hack = TRUE;
+ gtk_tree_view_get_preferred_width (GTK_WIDGET (tree_view), &requisition.width, NULL);
+ gtk_tree_view_get_preferred_height (GTK_WIDGET (tree_view), &requisition.height, NULL);
+ prevent_recursion_hack = FALSE;
/* If rows above the current position have changed height, this has
* affected the current view and thus needs a redraw.
@@ -6806,21 +6818,6 @@ install_presize_handler (GtkTreeView *tree_view)
}
}
-static void
-gtk_tree_view_bin_process_updates (GtkTreeView *tree_view)
-{
- /* Prior to drawing, we make sure the visible area is validated. */
- if (tree_view->priv->presize_handler_timer)
- {
- g_source_remove (tree_view->priv->presize_handler_timer);
- tree_view->priv->presize_handler_timer = 0;
-
- do_presize_handler (tree_view);
- }
-
- gdk_window_process_updates (tree_view->priv->bin_window, TRUE);
-}
-
static gboolean
scroll_sync_handler (GtkTreeView *tree_view)
{
@@ -7162,7 +7159,7 @@ drag_scan_timeout (gpointer data)
GtkTreeViewColumn *column = NULL;
GdkRectangle visible_rect;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
tree_view = GTK_TREE_VIEW (data);
@@ -7200,7 +7197,7 @@ drag_scan_timeout (gpointer data)
}
}
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
return TRUE;
}
@@ -8128,9 +8125,6 @@ gtk_tree_view_set_fixed_height_mode (GtkTreeView *tree_view,
{
tree_view->priv->fixed_height_mode = 0;
tree_view->priv->fixed_height = -1;
-
- /* force a revalidation */
- install_presize_handler (tree_view);
}
else
{
@@ -8149,11 +8143,11 @@ gtk_tree_view_set_fixed_height_mode (GtkTreeView *tree_view,
tree_view->priv->fixed_height_mode = 1;
tree_view->priv->fixed_height = -1;
-
- if (tree_view->priv->tree)
- initialize_fixed_height_mode (tree_view);
}
+ /* force a revalidation */
+ install_presize_handler (tree_view);
+
g_object_notify (G_OBJECT (tree_view), "fixed-height-mode");
}
@@ -8454,6 +8448,8 @@ gtk_tree_view_style_updated (GtkWidget *widget)
GtkTreeView *tree_view = GTK_TREE_VIEW (widget);
GList *list;
GtkTreeViewColumn *column;
+ GtkStyleContext *style_context;
+ const GtkBitmask *changes;
GTK_WIDGET_CLASS (gtk_tree_view_parent_class)->style_updated (widget);
@@ -8465,21 +8461,19 @@ gtk_tree_view_style_updated (GtkWidget *widget)
gtk_tree_view_set_enable_tree_lines (tree_view, tree_view->priv->tree_lines_enabled);
}
- gtk_widget_style_get (widget,
- "expander-size", &tree_view->priv->expander_size,
- NULL);
- tree_view->priv->expander_size += EXPANDER_EXTRA_PADDING;
-
- for (list = tree_view->priv->columns; list; list = list->next)
+ style_context = gtk_widget_get_style_context (widget);
+ changes = _gtk_style_context_get_changes (style_context);
+ if (changes == NULL || _gtk_css_style_property_changes_affect_size (changes))
{
- column = list->data;
- _gtk_tree_view_column_cell_set_dirty (column, TRUE);
- }
-
- tree_view->priv->fixed_height = -1;
- _gtk_rbtree_mark_invalid (tree_view->priv->tree);
+ for (list = tree_view->priv->columns; list; list = list->next)
+ {
+ column = list->data;
+ _gtk_tree_view_column_cell_set_dirty (column, TRUE);
+ }
- gtk_widget_queue_resize (widget);
+ tree_view->priv->fixed_height = -1;
+ _gtk_rbtree_mark_invalid (tree_view->priv->tree);
+ }
}
@@ -8509,21 +8503,27 @@ gtk_tree_view_get_path_for_child (GtkContainer *container,
GtkTreeView *tree_view = GTK_TREE_VIEW (container);
GtkWidgetPath *path;
gboolean rtl;
- GList *list;
+ GList *list, *visible_columns = NULL;
gint n_col = 0;
path = GTK_CONTAINER_CLASS (gtk_tree_view_parent_class)->get_path_for_child (container, child);
rtl = (gtk_widget_get_direction (GTK_WIDGET (container)) == GTK_TEXT_DIR_RTL);
- for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
- list;
- list = (rtl ? list->prev : list->next))
+ for (list = tree_view->priv->columns; list; list = list->next)
{
GtkTreeViewColumn *column = list->data;
- GtkRegionFlags flags = 0;
- if (!gtk_tree_view_column_get_visible (column))
- continue;
+ if (gtk_tree_view_column_get_visible (column))
+ visible_columns = g_list_prepend (visible_columns, column);
+ }
+
+ if (!rtl)
+ visible_columns = g_list_reverse (visible_columns);
+
+ for (list = visible_columns; list != NULL; list = list->next)
+ {
+ GtkTreeViewColumn *column = list->data;
+ GtkRegionFlags flags = 0;
n_col++;
@@ -8539,15 +8539,13 @@ gtk_tree_view_get_path_for_child (GtkContainer *container,
if (n_col == 1)
flags |= GTK_REGION_FIRST;
- if ((rtl && !list->prev) ||
- (!rtl && !list->next))
+ if (!list->next)
flags |= GTK_REGION_LAST;
- gtk_widget_path_iter_add_region (path, -1, GTK_STYLE_REGION_COLUMN_HEADER, flags);
+ gtk_widget_path_iter_add_region (path, gtk_widget_path_length (path) - 2, GTK_STYLE_REGION_COLUMN_HEADER, flags);
break;
}
-
- gtk_widget_path_append_for_widget (path, child);
+ g_list_free (visible_columns);
return path;
}
@@ -9000,7 +8998,6 @@ gtk_tree_view_row_deleted (GtkTreeModel *model,
gboolean selection_changed = FALSE, cursor_changed = FALSE;
GtkRBTree *cursor_tree = NULL;
GtkRBNode *cursor_node = NULL;
- GtkStyleContext *context;
g_return_if_fail (path != NULL);
@@ -9105,10 +9102,6 @@ gtk_tree_view_row_deleted (GtkTreeModel *model,
tree_view->priv->top_row = NULL;
}
- /* Cancel any ongoing animation happening within the row */
- context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
- gtk_style_context_cancel_animations (context, node);
-
install_scroll_sync_handler (tree_view);
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@@ -9247,10 +9240,19 @@ gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
GList *list;
GtkTreeViewColumn *tmp_column = NULL;
gint total_width;
+ gint expander_size, expander_render_size;
+ gint horizontal_separator;
gboolean indent_expanders;
gboolean rtl;
+ gtk_widget_style_get (GTK_WIDGET (tree_view),
+ "indent-expanders", &indent_expanders,
+ "horizontal-separator", &horizontal_separator,
+ NULL);
+
rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
+ expander_size = gtk_tree_view_get_expander_size (tree_view);
+ expander_render_size = expander_size - (horizontal_separator / 2);
total_width = 0;
for (list = (rtl ? g_list_last (tree_view->priv->columns) : g_list_first (tree_view->priv->columns));
@@ -9262,7 +9264,7 @@ gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
if (gtk_tree_view_is_expander_column (tree_view, tmp_column))
{
if (rtl)
- x_offset = total_width + gtk_tree_view_column_get_width (tmp_column) - tree_view->priv->expander_size;
+ x_offset = total_width + gtk_tree_view_column_get_width (tmp_column) - expander_size;
else
x_offset = total_width;
break;
@@ -9272,16 +9274,14 @@ gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
total_width += gtk_tree_view_column_get_width (tmp_column);
}
- gtk_widget_style_get (GTK_WIDGET (tree_view),
- "indent-expanders", &indent_expanders,
- NULL);
+ x_offset += (expander_size - expander_render_size);
if (indent_expanders)
{
if (rtl)
- x_offset -= tree_view->priv->expander_size * _gtk_rbtree_get_depth (tree);
+ x_offset -= expander_size * _gtk_rbtree_get_depth (tree);
else
- x_offset += tree_view->priv->expander_size * _gtk_rbtree_get_depth (tree);
+ x_offset += expander_size * _gtk_rbtree_get_depth (tree);
}
*x1 = x_offset;
@@ -9289,7 +9289,7 @@ gtk_tree_view_get_arrow_xrange (GtkTreeView *tree_view,
if (tmp_column &&
gtk_tree_view_column_get_visible (tmp_column))
/* +1 because x2 isn't included in the range. */
- *x2 = *x1 + tree_view->priv->expander_size + 1;
+ *x2 = *x1 + expander_render_size + 1;
else
*x2 = *x1;
}
@@ -9383,10 +9383,6 @@ gtk_tree_view_clamp_node_visible (GtkTreeView *tree_view,
path = _gtk_tree_path_new_from_rbtree (tree, node);
if (path)
{
- /* We process updates because we want to clear old selected items when we scroll.
- * if this is removed, we get a "selection streak" at the bottom. */
- gtk_tree_view_bin_process_updates (tree_view);
-
gtk_tree_view_scroll_to_cell (tree_view, path, NULL, FALSE, 0.0, 0.0);
gtk_tree_path_free (path);
}
@@ -9789,9 +9785,13 @@ _gtk_tree_view_column_start_drag (GtkTreeView *tree_view,
GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (tree_view));
GtkWidget *button;
GdkDevice *pointer, *keyboard;
+ GdkWindowAttr attributes;
+ guint attributes_mask;
+ GtkStyleContext *context;
g_return_if_fail (tree_view->priv->column_drag_info == NULL);
g_return_if_fail (tree_view->priv->cur_reorder == NULL);
+ g_return_if_fail (tree_view->priv->drag_window == NULL);
gtk_tree_view_set_column_drag_info (tree_view, column);
@@ -9800,28 +9800,25 @@ _gtk_tree_view_column_start_drag (GtkTreeView *tree_view,
button = gtk_tree_view_column_get_button (column);
- if (tree_view->priv->drag_window == NULL)
- {
- GdkWindowAttr attributes;
- guint attributes_mask;
+ context = gtk_widget_get_style_context (button);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_DND);
- gtk_widget_get_allocation (button, &button_allocation);
+ gtk_widget_get_allocation (button, &button_allocation);
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.wclass = GDK_INPUT_OUTPUT;
- attributes.x = button_allocation.x;
- attributes.y = 0;
- attributes.width = button_allocation.width;
- attributes.height = button_allocation.height;
- attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
- attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
- attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
+ attributes.window_type = GDK_WINDOW_CHILD;
+ attributes.wclass = GDK_INPUT_OUTPUT;
+ attributes.x = button_allocation.x;
+ attributes.y = 0;
+ attributes.width = button_allocation.width;
+ attributes.height = button_allocation.height;
+ attributes.visual = gtk_widget_get_visual (GTK_WIDGET (tree_view));
+ attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | GDK_EXPOSURE_MASK | GDK_POINTER_MOTION_MASK;
+ attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
- tree_view->priv->drag_window = gdk_window_new (tree_view->priv->bin_window,
- &attributes,
- attributes_mask);
- gdk_window_set_user_data (tree_view->priv->drag_window, GTK_WIDGET (tree_view));
- }
+ tree_view->priv->drag_window = gdk_window_new (tree_view->priv->header_window,
+ &attributes,
+ attributes_mask);
+ gtk_widget_register_window (GTK_WIDGET (tree_view), tree_view->priv->drag_window);
if (gdk_device_get_source (device) == GDK_SOURCE_KEYBOARD)
{
@@ -9918,7 +9915,8 @@ gtk_tree_view_queue_draw_arrow (GtkTreeView *tree_view,
gtk_widget_get_allocation (GTK_WIDGET (tree_view), &allocation);
rect.x = 0;
- rect.width = MAX (tree_view->priv->expander_size, MAX (tree_view->priv->width, allocation.width));
+ rect.width = gtk_tree_view_get_expander_size (tree_view);
+ rect.width = MAX (rect.width, MAX (tree_view->priv->width, allocation.width));
rect.y = gtk_tree_view_get_row_y_offset (tree_view, tree, node);
rect.height = gtk_tree_view_get_row_height (tree_view, node);
@@ -10090,16 +10088,14 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
gint x_offset = 0;
gint x2;
gint vertical_separator;
- gint expander_size;
GtkCellRendererState flags = 0;
widget = GTK_WIDGET (tree_view);
context = gtk_widget_get_style_context (widget);
gtk_widget_style_get (widget,
- "vertical-separator", &vertical_separator,
- NULL);
- expander_size = tree_view->priv->expander_size - EXPANDER_EXTRA_PADDING;
+ "vertical-separator", &vertical_separator,
+ NULL);
if (! GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT))
return;
@@ -10109,7 +10105,7 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
area.x = x_offset;
area.y = gtk_tree_view_get_cell_area_y_offset (tree_view, tree, node,
vertical_separator);
- area.width = expander_size;
+ area.width = x2 - x_offset;
area.height = gtk_tree_view_get_cell_area_height (tree_view, node,
vertical_separator);
@@ -10132,13 +10128,10 @@ gtk_tree_view_draw_arrow (GtkTreeView *tree_view,
gtk_style_context_set_state (context, state);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_EXPANDER);
- gtk_style_context_push_animatable_region (context, node);
-
gtk_render_expander (context, cr,
area.x, area.y,
area.width, area.height);
- gtk_style_context_pop_animatable_region (context);
gtk_style_context_restore (context);
}
@@ -11122,50 +11115,6 @@ gtk_tree_view_start_interactive_search (GtkTreeView *tree_view)
TRUE);
}
-/* this function returns the new width of the column being resized given
- * the column and x position of the cursor; the x cursor position is passed
- * in as a pointer and automagicly corrected if it's beyond min/max limits
- */
-static gint
-gtk_tree_view_new_column_width (GtkTreeView *tree_view,
- gint i,
- gint *x)
-{
- GtkAllocation allocation;
- GtkTreeViewColumn *column;
- GtkRequisition button_req;
- gint max_width, min_width;
- gint width;
- gboolean rtl;
-
- /* first translate the x position from widget->window
- * to clist->clist_window
- */
- rtl = (gtk_widget_get_direction (GTK_WIDGET (tree_view)) == GTK_TEXT_DIR_RTL);
- column = g_list_nth (tree_view->priv->columns, i)->data;
- gtk_widget_get_allocation (gtk_tree_view_column_get_button (column), &allocation);
- width = rtl ? (allocation.x + allocation.width - *x) : (*x - allocation.x);
-
- /* Clamp down the value */
- min_width = gtk_tree_view_column_get_min_width (column);
- if (min_width == -1)
- {
- gtk_widget_get_preferred_size (gtk_tree_view_column_get_button (column), &button_req, NULL);
- width = MAX (button_req.width, width);
- }
- else
- width = MAX (min_width, width);
-
- max_width = gtk_tree_view_column_get_max_width (column);
- if (max_width != -1)
- width = MIN (width, max_width);
-
- *x = rtl ? (allocation.x + allocation.width - width) : (allocation.x + width);
-
- return width;
-}
-
-
/* FIXME this adjust_allocation is a big cut-and-paste from
* GtkCList, needs to be some "official" way to do this
* factored out.
@@ -11247,7 +11196,6 @@ gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment,
{
if (gtk_widget_get_realized (GTK_WIDGET (tree_view)))
{
- GtkStyleContext *context;
gint dy;
gdk_window_move (tree_view->priv->bin_window,
@@ -11290,9 +11238,6 @@ gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment,
}
gdk_window_scroll (tree_view->priv->bin_window, 0, dy);
- context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
- gtk_style_context_scroll_animations (context, tree_view->priv->bin_window, 0, dy);
-
if (tree_view->priv->dy != (int) gtk_adjustment_get_value (tree_view->priv->vadjustment))
{
/* update our dy and top_row */
@@ -11301,9 +11246,6 @@ gtk_tree_view_adjustment_changed (GtkAdjustment *adjustment,
if (!tree_view->priv->in_top_row_to_dy)
gtk_tree_view_dy_to_top_row (tree_view);
}
-
- gdk_window_process_updates (tree_view->priv->header_window, TRUE);
- gtk_tree_view_bin_process_updates (tree_view);
}
}
@@ -11361,7 +11303,7 @@ gtk_tree_view_get_model (GtkTreeView *tree_view)
/**
* gtk_tree_view_set_model:
- * @tree_view: A #GtkTreeNode.
+ * @tree_view: A #GtkTreeView.
* @model: (allow-none): The model.
*
* Sets the model for a #GtkTreeView. If the @tree_view already has a model
@@ -11390,14 +11332,10 @@ gtk_tree_view_set_model (GtkTreeView *tree_view,
if (tree_view->priv->model)
{
GList *tmplist = tree_view->priv->columns;
- GtkStyleContext *context;
gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree);
gtk_tree_view_stop_editing (tree_view, TRUE);
- context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
- gtk_style_context_cancel_animations (context, NULL);
-
g_signal_handlers_disconnect_by_func (tree_view->priv->model,
gtk_tree_view_row_changed,
tree_view);
@@ -11847,7 +11785,7 @@ gtk_tree_view_get_headers_clickable (GtkTreeView *tree_view)
}
/**
- * gtk_tree_view_set_rules_hint
+ * gtk_tree_view_set_rules_hint:
* @tree_view: a #GtkTreeView
* @setting: %TRUE if the tree requires reading across rows
*
@@ -11883,7 +11821,7 @@ gtk_tree_view_set_rules_hint (GtkTreeView *tree_view,
}
/**
- * gtk_tree_view_get_rules_hint
+ * gtk_tree_view_get_rules_hint:
* @tree_view: a #GtkTreeView
*
* Gets the setting set by gtk_tree_view_set_rules_hint().
@@ -11898,6 +11836,50 @@ gtk_tree_view_get_rules_hint (GtkTreeView *tree_view)
return tree_view->priv->has_rules;
}
+
+/**
+ * gtk_tree_view_set_activate_on_single_click:
+ * @tree_view: a #GtkTreeView
+ * @single: %TRUE to emit row-activated on a single click
+ *
+ * Cause the #GtkTreeView::row-activated signal to be emitted
+ * on a single click instead of a double click.
+ *
+ * Since: 3.8
+ **/
+void
+gtk_tree_view_set_activate_on_single_click (GtkTreeView *tree_view,
+ gboolean single)
+{
+ g_return_if_fail (GTK_IS_TREE_VIEW (tree_view));
+
+ single = single != FALSE;
+
+ if (tree_view->priv->activate_on_single_click == single)
+ return;
+
+ tree_view->priv->activate_on_single_click = single;
+ g_object_notify (G_OBJECT (tree_view), "activate-on-single-click");
+}
+
+/**
+ * gtk_tree_view_get_activate_on_single_click:
+ * @tree_view: a #GtkTreeView
+ *
+ * Gets the setting set by gtk_tree_view_set_activate_on_single_click().
+ *
+ * Return value: %TRUE if row-activated will be emitted on a single click
+ *
+ * Since: 3.8
+ **/
+gboolean
+gtk_tree_view_get_activate_on_single_click (GtkTreeView *tree_view)
+{
+ g_return_val_if_fail (GTK_IS_TREE_VIEW (tree_view), FALSE);
+
+ return tree_view->priv->activate_on_single_click;
+}
+
/* Public Column functions
*/
@@ -11933,7 +11915,7 @@ _gtk_tree_view_reset_header_styles (GtkTreeView *tree_view)
GtkTreeViewColumn *column = columns->data;
GtkWidget *header_widget;
- if (gtk_tree_view_column_get_visible (column))
+ if (!gtk_tree_view_column_get_visible (column))
continue;
header_widget = gtk_tree_view_column_get_widget (column);
@@ -11941,7 +11923,7 @@ _gtk_tree_view_reset_header_styles (GtkTreeView *tree_view)
if (!header_widget)
header_widget = gtk_tree_view_column_get_button (column);
- gtk_widget_reset_style (header_widget);
+ _gtk_widget_invalidate_style_context (header_widget, GTK_CSS_CHANGE_PARENT_REGION);
}
}
@@ -12156,7 +12138,7 @@ gtk_tree_view_insert_column_with_attributes (GtkTreeView *tree_view,
* @dnotify: destroy notifier for @data
*
* Convenience function that inserts a new column into the #GtkTreeView
- * with the given cell renderer and a #GtkCellDataFunc to set cell renderer
+ * with the given cell renderer and a #GtkTreeCellDataFunc to set cell renderer
* attributes (normally using data from the model). See also
* gtk_tree_view_column_set_cell_data_func(), gtk_tree_view_column_pack_start().
* If @tree_view has "fixed_height" mode enabled, then the new column will have its
@@ -12789,22 +12771,6 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
tree, node,
GTK_CELL_RENDERER_EXPANDED);
- if (animate)
- {
- GtkStyleContext *context;
-
- context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
-
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_EXPANDER);
-
- gtk_style_context_notify_state_change (context, tree_view->priv->bin_window,
- node, GTK_STATE_ACTIVE, TRUE);
-
- _gtk_style_context_invalidate_animation_areas (context);
- gtk_style_context_restore (context);
- }
-
install_presize_handler (tree_view);
g_signal_emit (tree_view, tree_view_signals[ROW_EXPANDED], 0, &iter, path);
@@ -12968,22 +12934,6 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
if (selection_changed)
g_signal_emit_by_name (tree_view->priv->selection, "changed");
- if (animate)
- {
- GtkStyleContext *context;
-
- context = gtk_widget_get_style_context (GTK_WIDGET (tree_view));
-
- gtk_style_context_save (context);
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_EXPANDER);
-
- gtk_style_context_notify_state_change (context, tree_view->priv->bin_window,
- node, GTK_STATE_ACTIVE, FALSE);
-
- _gtk_style_context_invalidate_animation_areas (context);
- gtk_style_context_restore (context);
- }
-
if (gtk_widget_get_mapped (GTK_WIDGET (tree_view)))
{
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
@@ -13591,6 +13541,7 @@ gtk_tree_view_get_cell_area_height (GtkTreeView *tree_view,
GtkRBNode *node,
gint vertical_separator)
{
+ int expander_size = gtk_tree_view_get_expander_size (tree_view);
int height;
/* The "cell" areas are the cell_area passed in to gtk_cell_renderer_render(),
@@ -13602,8 +13553,8 @@ gtk_tree_view_get_cell_area_height (GtkTreeView *tree_view,
* function will not be called for irregular (e.g. separator) rows.
*/
height = gtk_tree_view_get_row_height (tree_view, node);
- if (height < tree_view->priv->expander_size)
- height = tree_view->priv->expander_size;
+ if (height < expander_size)
+ height = expander_size;
return height - vertical_separator;
}
@@ -13710,9 +13661,10 @@ gtk_tree_view_get_cell_area (GtkTreeView *tree_view,
if (gtk_tree_view_draw_expanders (tree_view))
{
+ int expander_size = gtk_tree_view_get_expander_size (tree_view);
if (!rtl)
- rect->x += depth * tree_view->priv->expander_size;
- rect->width -= depth * tree_view->priv->expander_size;
+ rect->x += depth * expander_size;
+ rect->width -= depth * expander_size;
}
rect->width = MAX (rect->width, 0);
@@ -13724,6 +13676,7 @@ static inline gint
gtk_tree_view_get_row_height (GtkTreeView *tree_view,
GtkRBNode *node)
{
+ int expander_size = gtk_tree_view_get_expander_size (tree_view);
int height;
/* The "background" areas of all rows/cells add up to cover the entire tree.
@@ -13736,7 +13689,7 @@ gtk_tree_view_get_row_height (GtkTreeView *tree_view,
*/
height = GTK_RBNODE_GET_HEIGHT (node);
if (height <= 0)
- height = tree_view->priv->expander_size;
+ height = expander_size;
return height;
}
@@ -14603,8 +14556,6 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView *tree_view,
context = gtk_widget_get_style_context (widget);
gtk_style_context_save (context);
-
- gtk_style_context_add_class (context, GTK_STYLE_CLASS_VIEW);
gtk_style_context_add_region (context, GTK_STYLE_REGION_COLUMN, 0);
gtk_widget_style_get (widget,
@@ -14680,9 +14631,10 @@ gtk_tree_view_create_row_drag_icon (GtkTreeView *tree_view,
if (gtk_tree_view_draw_expanders (tree_view))
{
+ int expander_size = gtk_tree_view_get_expander_size (tree_view);
if (!rtl)
- cell_area.x += depth * tree_view->priv->expander_size;
- cell_area.width -= depth * tree_view->priv->expander_size;
+ cell_area.x += depth * expander_size;
+ cell_area.width -= depth * expander_size;
}
}
@@ -15764,7 +15716,7 @@ gtk_tree_view_get_hover_selection (GtkTreeView *tree_view)
* @tree_view: a #GtkTreeView
* @expand: %TRUE to enable hover selection mode
*
- * Enables of disables the hover expansion mode of @tree_view.
+ * Enables or disables the hover expansion mode of @tree_view.
* Hover expansion makes rows expand or collapse if the pointer
* moves over them.
*
@@ -16469,7 +16421,7 @@ gtk_tree_view_set_tooltip_query_cb (GtkWidget *widget,
* for you. @column should be set to the column in @tree_view's model
* containing the tooltip texts, or -1 to disable this feature.
*
- * When enabled, #GtkWidget::has-tooltip will be set to %TRUE and
+ * When enabled, #GtkWidget:has-tooltip will be set to %TRUE and
* @tree_view will connect a #GtkWidget::query-tooltip signal handler.
*
* Note that the signal handler sets the text with gtk_tooltip_set_markup(),