Commit d958f92c authored by jean-pierre charras's avatar jean-pierre charras
Browse files

Kicad manager: fix a minor issue noticeable on Kubuntu 12.04 (bad size of buttons area)

parent 41064434

kicad/commandframe.cpp

+12 −18
Original line number Original line Diff line number Diff line
@@ -40,7 +40,6 @@ RIGHT_KM_FRAME::RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent ) : 
{

{

    m_Parent    = parent;

    m_Parent    = parent;

    m_MessagesBox = NULL;

    m_MessagesBox = NULL;

    m_ButtPanel = new wxPanel( this, wxID_ANY );

    m_bitmapButtons_maxHeigth = 0;

    m_bitmapButtons_maxHeigth = 0;

    m_ButtonSeparation = 10;        // control of command buttons position

    m_ButtonSeparation = 10;        // control of command buttons position

    m_ButtonsListPosition.x = m_ButtonSeparation;

    m_ButtonsListPosition.x = m_ButtonSeparation;
@@ -48,8 +47,9 @@ RIGHT_KM_FRAME::RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent ) : 
    m_ButtonLastPosition    = m_ButtonsListPosition;

    m_ButtonLastPosition    = m_ButtonsListPosition;





    // Add bitmap buttons to launch KiCad utilities:

    // Add bitmap buttons to launch KiCad utilities:

    m_ButtPanel = new wxPanel( this, wxID_ANY );

    CreateCommandToolbar();

    CreateCommandToolbar();

    m_ButtonsPanelHeight    = m_ButtonsListPosition.y + m_bitmapButtons_maxHeigth + 10;

    m_ButtonsPanelHeight    = m_ButtonsListPosition.y + m_bitmapButtons_maxHeigth + m_ButtonSeparation;





    // Add the wxTextCtrl showing all messages from KiCad:

    // Add the wxTextCtrl showing all messages from KiCad:

    m_MessagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString,

    m_MessagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString,
@@ -61,23 +61,17 @@ RIGHT_KM_FRAME::RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent ) : 
void RIGHT_KM_FRAME::OnSize( wxSizeEvent& event )

void RIGHT_KM_FRAME::OnSize( wxSizeEvent& event )

{

{

    #define EXTRA_MARGE 4

    #define EXTRA_MARGE 4

    wxSize  wsize = GetClientSize();

    wxSize  wsize;

    wsize.x -= EXTRA_MARGE;

    wsize.x = GetClientSize().x;

    wsize.y -= m_ButtonsPanelHeight + EXTRA_MARGE;

    wxPoint wpos;

    wpos.x = EXTRA_MARGE / 2;

    wpos.y = m_ButtonsPanelHeight + (EXTRA_MARGE / 2);

    if( m_MessagesBox )

    {

        m_MessagesBox->SetSize( wsize );

        m_MessagesBox->SetPosition( wpos );

    }





    wpos.y = EXTRA_MARGE / 2;

    // Fix size of buttons area

    m_ButtPanel->SetPosition( wpos );

    wsize.y = m_ButtonsPanelHeight;

    wsize.y -= m_ButtonsPanelHeight - EXTRA_MARGE;

    m_ButtPanel->SetSize( wsize );

    m_ButtPanel->SetSize( wsize );

    m_ButtPanel->Refresh();



    // Fix position and size of the message area, below the buttons area

    wsize.y = GetClientSize().y - m_ButtonsPanelHeight;

    m_MessagesBox->SetSize( wsize );

    m_MessagesBox->SetPosition( wxPoint( 0, m_ButtonsPanelHeight ) );





    event.Skip();

    event.Skip();

}

}