Gtk3Migr : fix gtktimeselection (was not visible!)

game-stop · Sep 24, 2018 · aacf57a · aacf57a
1 parent 8875b53
commit aacf57a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 10 deletions.
diff --git a/veejay-current/veejay-client/src/gtktimeselection.c b/veejay-current/veejay-client/src/gtktimeselection.c
@@ -736,20 +736,15 @@ cairo_rectangle_round (cairo_t * cr,
 static gboolean timeline_draw (GtkWidget *widget, cairo_t *cr )
 {
   TimelineSelection *te = TIMELINE_SELECTION( widget );
-  GtkAllocation all;
-  gtk_widget_get_allocation (widget, &all);
-  double width = all.width;
-  double height = all.height;
+  double width = gtk_widget_get_allocated_width (widget);
+  double height = gtk_widget_get_allocated_height (widget);
 
 	gdouble marker_width = width/ te->num_video_frames;
 //	gdouble marker_height = height / te->num_video_frames;
 	gdouble marker_height = te->frame_height;
 
 	te->frame_width = marker_width;
 
-	cairo_save(cr);
-	cairo_identity_matrix(cr);
-
 /* Draw stepper */
 	if( te->has_stepper )
 	{
@@ -843,7 +838,6 @@ static gboolean timeline_draw (GtkWidget *widget, cairo_t *cr )
 		te->selection.height = te->font_line;
 		cairo_fill_preserve(cr);
 	}
-	cairo_restore(cr);
 
 	return FALSE;
 }

diff --git a/veejay-current/veejay-client/src/vj-api.c b/veejay-current/veejay-client/src/vj-api.c
@@ -7789,9 +7789,8 @@ void vj_gui_init(char *glade_file,
 
     bankport_ = vpn( VEVO_ANONYMOUS_PORT );
 
-    gtk_widget_show(frame);
     gtk_container_add( GTK_CONTAINER(frame), info->tl );
-    gtk_widget_show(info->tl);
+    gtk_widget_show_all(frame);
 
     GtkWidget *mainw = glade_xml_get_widget_(info->main_window,"gveejay_window" );