chipnameTextCtrl minimum text width

eeschema/dialog_edit_component_in_schematic.cpp

@@ -19,6 +19,23 @@
 int DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::s_SelectedRow;
 
 
+/**
+ * Function GetTextSize
+ * computes the size of a text string in pixels from the wxFont used within a wxTextCtrl.
+ * @param aString is the text string to measure, must be a single line, no newlines.
+ * @param aWindow is the wxWindow which is the parent of the wxTextCtrl \a aCtrl.
+ * @param aWidth is where to put the width of the string in pixels.
+ * @param aHeight is where to put the heigth of the string in pixels.
+ */
+static void GetTextSize( const wxString& aString, wxWindow* aWindow, wxTextCtrl* aCtrl, wxCoord* aWidth, wxCoord* aHeight )
+{
+    wxClientDC dc( aWindow );
+
+    dc.SetFont( aCtrl->GetFont() );
+    dc.GetTextExtent( aString, aWidth, aHeight );
+}
+
+
 /**********************************************************************/
 void InstallCmpeditFrame( WinEDA_SchematicFrame* parent, wxPoint& pos,
                           SCH_COMPONENT* aComponent )
@@ -35,13 +52,30 @@ void InstallCmpeditFrame( WinEDA_SchematicFrame* parent, wxPoint& pos,
     }
     else
     {
-        DIALOG_EDIT_COMPONENT_IN_SCHEMATIC* frame =
+        DIALOG_EDIT_COMPONENT_IN_SCHEMATIC* dialog =
             new DIALOG_EDIT_COMPONENT_IN_SCHEMATIC( parent );
 
-        frame->InitBuffers( aComponent );
+        dialog->InitBuffers( aComponent );
+
+        // make sure the chipnameTextCtrl is wide enough to hold any unusually long chip names:
+        {
+            wxCoord width;
+            wxCoord height;
 
-        frame->ShowModal();
-        frame->Destroy();
+            GetTextSize( dialog->chipnameTextCtrl->GetValue(), dialog, dialog->chipnameTextCtrl, &width, &height );
+
+            wxSize size = dialog->chipnameTextCtrl->GetSize();
+
+            if( size.GetWidth() < width + 10 )
+            {
+                size.SetWidth( width + 10 );
+                dialog->chipnameTextCtrl->SetSizeHints( size );
+                dialog->Layout();
+            }
+        }
+
+        dialog->ShowModal();
+        dialog->Destroy();
     }
 
     parent->DrawPanel->MouseToCursorSchema();
@@ -598,6 +632,7 @@ void DIALOG_EDIT_COMPONENT_IN_SCHEMATIC::copyOptionsToPanel()
 
     if( unitcount < 1 )
         unitcount = 1;
+
     if( unitcount < choiceCount )
     {
         while( unitcount < choiceCount )

eeschema/dialog_edit_component_in_schematic.h

@@ -12,6 +12,9 @@
  */
 class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC : public DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP
 {
+    friend void InstallCmpeditFrame( WinEDA_SchematicFrame* parent, wxPoint& pos,
+                          SCH_COMPONENT* aComponent );
+
     WinEDA_SchematicFrame*  m_Parent;
     SCH_COMPONENT*          m_Cmp;
     EDA_LibComponentStruct* m_LibEntry;

eeschema/dialog_edit_component_in_schematic_fbp.cpp

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Aug  7 2008)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -71,7 +71,6 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
 	optionsSizer->Add( chipnameSizer, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 8 );
 	
 	convertCheckBox = new wxCheckBox( this, wxID_ANY, _("Convert"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	convertCheckBox->SetToolTip( _("Use the alternate shape of this component.\nFor gates, this is the \"De Morgan\" conversion") );
 	
 	optionsSizer->Add( convertCheckBox, 0, wxALL, 8 );
@@ -118,13 +117,11 @@ DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP::DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP(
 	bShowRotateSizer = new wxBoxSizer( wxVERTICAL );
 	
 	showCheckBox = new wxCheckBox( this, wxID_ANY, _("Show"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	showCheckBox->SetToolTip( _("Check if you want this field visible") );
 	
 	bShowRotateSizer->Add( showCheckBox, 0, wxALL, 5 );
 	
 	rotateCheckBox = new wxCheckBox( this, wxID_ANY, _("Rotate"), wxDefaultPosition, wxDefaultSize, 0 );
-	
 	rotateCheckBox->SetToolTip( _("Check if you want this field's text rotated 90 degrees") );
 	
 	bShowRotateSizer->Add( rotateCheckBox, 0, wxALL, 5 );

eeschema/dialog_edit_component_in_schematic_fbp.h

 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Apr 16 2008)
+// C++ code generated with wxFormBuilder (version Aug  7 2008)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO "NOT" EDIT THIS FILE!
@@ -79,7 +79,8 @@ class DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP : public wxDialog
 		
 	
 	public:
-		DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 864,550 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU );
+		
+		DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("Component Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 864,640 ), long style = wxCAPTION|wxCLOSE_BOX|wxDEFAULT_DIALOG_STYLE|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxRESIZE_BORDER|wxSYSTEM_MENU );
 		~DIALOG_EDIT_COMPONENT_IN_SCHEMATIC_FBP();
 	
 };