diff --git a/pcbnew/dialog_netlist_fbp.cpp b/pcbnew/dialog_netlist_fbp.cpp index 54baa31387..a4b493f629 100644 --- a/pcbnew/dialog_netlist_fbp.cpp +++ b/pcbnew/dialog_netlist_fbp.cpp @@ -87,7 +87,7 @@ DIALOG_NETLIST_FBP::DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id, const w bUpperSizer->Add( bRightSizerButtons, 0, wxALIGN_CENTER_VERTICAL, 5 ); - bMainSizer->Add( bUpperSizer, 1, wxEXPAND, 5 ); + bMainSizer->Add( bUpperSizer, 0, wxEXPAND, 5 ); m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); bMainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 ); @@ -104,6 +104,8 @@ DIALOG_NETLIST_FBP::DIALOG_NETLIST_FBP( wxWindow* parent, wxWindowID id, const w bMainSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 ); m_MessageWindow = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_CHARWRAP|wxTE_MULTILINE|wxTE_READONLY|wxTE_WORDWRAP ); + m_MessageWindow->SetMinSize( wxSize( -1,200 ) ); + bMainSizer->Add( m_MessageWindow, 1, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); this->SetSizer( bMainSizer ); diff --git a/pcbnew/dialog_netlist_fbp.fbp b/pcbnew/dialog_netlist_fbp.fbp index a0154f44f7..be2207dca1 100644 --- a/pcbnew/dialog_netlist_fbp.fbp +++ b/pcbnew/dialog_netlist_fbp.fbp @@ -78,7 +78,7 @@ 5 wxEXPAND - 1 + 0 bUpperSizer @@ -815,7 +815,7 @@ wxID_ANY 0 - + -1,200 m_MessageWindow protected diff --git a/pcbnew/modules.cpp b/pcbnew/modules.cpp index bb8613674a..9a1435a423 100644 --- a/pcbnew/modules.cpp +++ b/pcbnew/modules.cpp @@ -460,6 +460,10 @@ void WinEDA_BasePcbFrame::Place_Module( MODULE* module, newpos = GetScreen()->m_Curseur; module->SetPosition( newpos ); + module->m_Flags = 0; + + delete s_ModuleInitialCopy; + s_ModuleInitialCopy = NULL; if( DC ) module->Draw( DrawPanel, DC, GR_OR ); @@ -480,6 +484,11 @@ void WinEDA_BasePcbFrame::Place_Module( MODULE* module, // Delete drag list EraseDragListe(); } + + g_Drag_Pistes_On = FALSE; + DrawPanel->ManageCurseur = NULL; + DrawPanel->ForceCloseManageCurseur = NULL; + if( !aDoNotRecreateRatsnest ) Compile_Ratsnest( DC, true ); @@ -488,13 +497,6 @@ void WinEDA_BasePcbFrame::Place_Module( MODULE* module, module->DisplayInfo( this ); - DrawPanel->ManageCurseur = NULL; - DrawPanel->ForceCloseManageCurseur = NULL; - module->m_Flags = 0; - g_Drag_Pistes_On = FALSE; - - delete s_ModuleInitialCopy; - s_ModuleInitialCopy = NULL; }