From 5ea88c897a4966deb9722a67f15af3f9965eee2b Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sat, 26 Dec 2020 22:59:47 +0000
Subject: [PATCH] Go back to AuiMgr strategy for 3D-viewer infobar.

There some issue with using the 3D canvas as a parent in the new
strategy.
---
 3d-viewer/3d_canvas/eda_3d_canvas.cpp |  6 ------
 3d-viewer/3d_viewer/eda_3d_viewer.cpp | 13 ++++++++++---
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.cpp b/3d-viewer/3d_canvas/eda_3d_canvas.cpp
index b0eaeced8f..552c5bbaee 100644
--- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp
+++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp
@@ -22,11 +22,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-/**
- * @file  eda_3d_canvas.cpp
- * @brief Implementation of a 3d canvas
- */
-
 #include <gal/opengl/kiglew.h>    // Must be included first
 #include <gl_utils.h>
 #include <wx/tokenzr.h>
@@ -36,7 +31,6 @@
 #include <eda_3d_viewer.h>
 #include <3d_rendering/3d_render_raytracing/c3d_render_raytracing.h>
 #include <3d_rendering/3d_render_ogl_legacy/c3d_render_ogl_legacy.h>
-#include <3d_rendering/3d_render_raytracing/accelerators/cbvh_pbrt.h>
 #include <3d_viewer_id.h>
 #include <board.h>
 #include <reporter.h>
diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.cpp b/3d-viewer/3d_viewer/eda_3d_viewer.cpp
index 3d68cc1a0b..d7c38a55c5 100644
--- a/3d-viewer/3d_viewer/eda_3d_viewer.cpp
+++ b/3d-viewer/3d_viewer/eda_3d_viewer.cpp
@@ -31,7 +31,6 @@
 #include "eda_3d_viewer.h"
 #include <3d_viewer_settings.h>
 #include <3d_viewer_id.h>
-#include "../common_ogl/cogl_att_list.h"
 #include <3d_viewer/tools/3d_actions.h>
 #include <3d_viewer/tools/3d_controller.h>
 #include <3d_viewer/tools/3d_conditions.h>
@@ -142,13 +141,21 @@ EDA_3D_VIEWER::EDA_3D_VIEWER( KIWAY *aKiway, PCB_BASE_FRAME *aParent, const wxSt
     CreateMenuBar();
     ReCreateMainToolbar();
 
+    m_infoBar = new WX_INFOBAR( this, &m_auimgr );
+
     m_auimgr.SetManagedWindow( this );
 
-    CreateInfoBar();
     m_auimgr.AddPane( m_mainToolBar, EDA_PANE().HToolbar().Name( "MainToolbar" ).Top().Layer( 6 ) );
+    m_auimgr.AddPane( m_infoBar, EDA_PANE().InfoBar().Name( "InfoBar" ).Top().Layer(1) );
     m_auimgr.AddPane( m_canvas, EDA_PANE().Canvas().Name( "DrawFrame" ).Center() );
 
-    FinishAUIInitialization();
+    // Call Update() to fix all pane default sizes, especially the "InfoBar" pane before
+    // hidding it.
+    m_auimgr.Update();
+
+    // We don't want the infobar displayed right away
+    m_auimgr.GetPane( "InfoBar" ).Hide();
+    m_auimgr.Update();
 
     m_canvas->SetInfoBar( m_infoBar );
     m_canvas->SetStatusBar( status_bar );