Commit 62e5a852 authored by Alexandru Băluț's avatar Alexandru Băluț

layer: Fix segfault on GTK 3.20

The Layer's do_draw method was not calling EventBox's do_draw method
and this caused the segfault .. somehow.

Removed the method since it was not doing anything useful.

Fixes https://phabricator.freedesktop.org/T7373

Differential Revision: https://phabricator.freedesktop.org/D912
parent 08dc01f9
......@@ -497,6 +497,3 @@ class Layer(Gtk.EventBox, timelineUtils.Zoomable, Loggable):
for ges_clip in self.ges_layer.get_clips():
if hasattr(ges_clip, "ui"):
ges_clip.ui.updatePosition()
def do_draw(self, cr):
Gtk.Box.do_draw(self, cr)
......@@ -246,6 +246,7 @@ class Timeline(Gtk.EventBox, Zoomable, Loggable):
self.layout.props.can_focus = True
self.layout.props.can_default = True
self.__layers_vbox = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
self.__layers_vbox.get_style_context().add_class("LayersBox")
self.__layers_vbox.props.width_request = self.get_allocated_width()
self.__layers_vbox.props.height_request = self.get_allocated_height()
self.layout.put(self.__layers_vbox, 0, 0)
......@@ -919,12 +920,13 @@ class Timeline(Gtk.EventBox, Zoomable, Loggable):
# Check the media types so the controls are set up properly.
layer.checkMediaTypes()
layer_widget = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
layer_widget.pack_start(layer.before_sep, False, False, 0)
layer_widget.pack_start(layer, True, True, 0)
layer_widget.pack_start(layer.after_sep, False, False, 0)
layer_widget.show_all()
self.__layers_vbox.pack_start(layer_widget, True, True, 0)
layer_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL)
layer_box.get_style_context().add_class("LayerBox")
layer_box.pack_start(layer.before_sep, False, False, 0)
layer_box.pack_start(layer, True, True, 0)
layer_box.pack_start(layer.after_sep, False, False, 0)
layer_box.show_all()
self.__layers_vbox.pack_start(layer_box, True, True, 0)
ges_layer.connect("notify::priority", self.__layerPriorityChangedCb)
......
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