Commit 02d53783 authored by Matthias Clasen's avatar Matthias Clasen Committed by U-eagle\daniel.boles

flowbox: don’t try to focus or draw NULL widgets

Rubberbanding over an empty area results in warnings, due to the code
trying to focus and queue a null pointer for drawing.

https://bugzilla.gnome.org/show_bug.cgi?id=780734
parent 124b6288
......@@ -2951,7 +2951,8 @@ gtk_flow_box_drag_gesture_update (GtkGestureDrag *gesture,
g_object_unref (priv->rubberband_node);
/* Grab focus here, so Escape-to-stop-rubberband works */
gtk_flow_box_update_cursor (box, priv->rubberband_first);
if (priv->rubberband_first)
gtk_flow_box_update_cursor (box, priv->rubberband_first);
gtk_gesture_set_state (GTK_GESTURE (gesture), GTK_EVENT_SEQUENCE_CLAIMED);
}
......@@ -2961,7 +2962,11 @@ gtk_flow_box_drag_gesture_update (GtkGestureDrag *gesture,
start_y + offset_y);
if (priv->rubberband_first == NULL)
priv->rubberband_first = child;
{
priv->rubberband_first = child;
if (priv->rubberband_first)
gtk_flow_box_update_cursor (box, priv->rubberband_first);
}
if (child != NULL)
priv->rubberband_last = child;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment