haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix statusbar conflict in 3d viewer 

Fix #7544
This commit is contained in:
Marek Roszko 2021-02-15 16:53:49 -05:00
parent 089b7afacf
commit 36d8ca7954
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
3d-viewer/3d_canvas/eda_3d_canvas.cpp
View File

@ -372,7 +372,7 @@ void EDA_3D_CANVAS::DoRePaint()
// !TODO: implement error reporter // !TODO: implement error reporter
INFOBAR_REPORTER warningReporter( m_parentInfoBar ); INFOBAR_REPORTER warningReporter( m_parentInfoBar );
STATUSBAR_REPORTER activityReporter( m_parentStatusBar, STATUSBAR_REPORTER activityReporter( m_parentStatusBar,
(int) EDA_3D_VIEWER_STATUSBAR::STATUS_TEXT ); (int) EDA_3D_VIEWER_STATUSBAR::ACTIVITY );
unsigned strtime = GetRunningMicroSecs(); unsigned strtime = GetRunningMicroSecs();
@ -710,7 +710,7 @@ void EDA_3D_CANVAS::OnMouseMove( wxMouseEvent& event )
( m_boardAdapter.GetRenderEngine() == RENDER_ENGINE::OPENGL_LEGACY ) ) ( m_boardAdapter.GetRenderEngine() == RENDER_ENGINE::OPENGL_LEGACY ) )
{ {
STATUSBAR_REPORTER reporter( m_parentStatusBar, STATUSBAR_REPORTER reporter( m_parentStatusBar,
static_cast<int>( EDA_3D_VIEWER_STATUSBAR::STATUS_TEXT ) ); static_cast<int>( EDA_3D_VIEWER_STATUSBAR::HOVERED_ITEM ) );
RAY mouseRay = getRayAtCurrrentMousePosition(); RAY mouseRay = getRayAtCurrrentMousePosition();

2
3d-viewer/3d_viewer/eda_3d_viewer.cpp
View File

@ -101,7 +101,7 @@ EDA_3D_VIEWER::EDA_3D_VIEWER( KIWAY *aKiway, PCB_BASE_FRAME *aParent, const wxSt
SetIcon( icon ); SetIcon( icon );
// Create the status line // 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 ) ); wxStatusBar *status_bar = CreateStatusBar( arrayDim( status_dims ) );
SetStatusWidths( arrayDim( status_dims ), status_dims ); SetStatusWidths( arrayDim( status_dims ), status_dims );

5
3d-viewer/3d_viewer/eda_3d_viewer.h
View File

@ -54,9 +54,10 @@
enum EDA_3D_VIEWER_STATUSBAR enum EDA_3D_VIEWER_STATUSBAR
{ {
STATUS_TEXT = 0, ACTIVITY = 0,
HOVERED_ITEM,
X_POS, X_POS,
Y_POS Y_POS,
}; };
/** /**