From 36d8ca7954ca0da2351c2cce89b07fce479cc0e9 Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Mon, 15 Feb 2021 16:53:49 -0500 Subject: [PATCH] Fix statusbar conflict in 3d viewer Fix #7544 --- 3d-viewer/3d_canvas/eda_3d_canvas.cpp | 4 ++-- 3d-viewer/3d_viewer/eda_3d_viewer.cpp | 2 +- 3d-viewer/3d_viewer/eda_3d_viewer.h | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/3d-viewer/3d_canvas/eda_3d_canvas.cpp b/3d-viewer/3d_canvas/eda_3d_canvas.cpp index e6b7e6a8c0..4987576880 100644 --- a/3d-viewer/3d_canvas/eda_3d_canvas.cpp +++ b/3d-viewer/3d_canvas/eda_3d_canvas.cpp @@ -372,7 +372,7 @@ void EDA_3D_CANVAS::DoRePaint() // !TODO: implement error reporter INFOBAR_REPORTER warningReporter( m_parentInfoBar ); STATUSBAR_REPORTER activityReporter( m_parentStatusBar, - (int) EDA_3D_VIEWER_STATUSBAR::STATUS_TEXT ); + (int) EDA_3D_VIEWER_STATUSBAR::ACTIVITY ); unsigned strtime = GetRunningMicroSecs(); @@ -710,7 +710,7 @@ void EDA_3D_CANVAS::OnMouseMove( wxMouseEvent& event ) ( m_boardAdapter.GetRenderEngine() == RENDER_ENGINE::OPENGL_LEGACY ) ) { STATUSBAR_REPORTER reporter( m_parentStatusBar, - static_cast( EDA_3D_VIEWER_STATUSBAR::STATUS_TEXT ) ); + static_cast( EDA_3D_VIEWER_STATUSBAR::HOVERED_ITEM ) ); RAY mouseRay = getRayAtCurrrentMousePosition(); diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.cpp b/3d-viewer/3d_viewer/eda_3d_viewer.cpp index d592104c41..4ca4e87db9 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer.cpp +++ b/3d-viewer/3d_viewer/eda_3d_viewer.cpp @@ -101,7 +101,7 @@ EDA_3D_VIEWER::EDA_3D_VIEWER( KIWAY *aKiway, PCB_BASE_FRAME *aParent, const wxSt SetIcon( icon ); // Create the status line - static const int status_dims[4] = { -1, 130, 130, 170 }; + static const int status_dims[4] = { -1, 170, 130, 130 }; wxStatusBar *status_bar = CreateStatusBar( arrayDim( status_dims ) ); SetStatusWidths( arrayDim( status_dims ), status_dims ); diff --git a/3d-viewer/3d_viewer/eda_3d_viewer.h b/3d-viewer/3d_viewer/eda_3d_viewer.h index 04be16c1b9..26405ba56e 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer.h +++ b/3d-viewer/3d_viewer/eda_3d_viewer.h @@ -54,9 +54,10 @@ enum EDA_3D_VIEWER_STATUSBAR { - STATUS_TEXT = 0, + ACTIVITY = 0, + HOVERED_ITEM, X_POS, - Y_POS + Y_POS, }; /**