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

Update columns when height changes too

This commit is contained in:
dsa-t 2021-12-17 07:00:24 +03:00 committed by Jeff Young
parent bc146db06d
commit d105e773a1
12 changed files with 27 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eeschema/dialogs/dialog_lib_edit_pin_table.cpp
View File

@ -521,7 +521,6 @@ DIALOG_LIB_EDIT_PIN_TABLE::DIALOG_LIB_EDIT_PIN_TABLE( SYMBOL_EDIT_FRAME* parent,
m_initialized = true; m_initialized = true;
m_modified = false; m_modified = false;
m_width = 0;
// Connect Events // Connect Events
m_grid->Connect( wxEVT_GRID_COL_SORT, m_grid->Connect( wxEVT_GRID_COL_SORT,
@ -728,11 +727,11 @@ void DIALOG_LIB_EDIT_PIN_TABLE::adjustGridColumns()
void DIALOG_LIB_EDIT_PIN_TABLE::OnSize( wxSizeEvent& event ) void DIALOG_LIB_EDIT_PIN_TABLE::OnSize( wxSizeEvent& event )
{ {
auto new_size = event.GetSize().GetX(); auto new_size = event.GetSize();
if( m_initialized && m_width != new_size ) if( m_initialized && m_size != new_size )
{ {
m_width = new_size; m_size = new_size;
adjustGridColumns(); adjustGridColumns();
} }

3
eeschema/dialogs/dialog_lib_edit_pin_table.h
View File

@ -79,8 +79,7 @@ protected:
LIB_SYMBOL* m_part; LIB_SYMBOL* m_part;
LIB_PINS m_pins; // a copy of the pins owned by me LIB_PINS m_pins; // a copy of the pins owned by me
bool m_modified; ///< true when there are unsaved changes bool m_modified; ///< true when there are unsaved changes
wxSize m_size;
int m_width;
PIN_TABLE_DATA_MODEL* m_dataModel; PIN_TABLE_DATA_MODEL* m_dataModel;
}; };

9
eeschema/dialogs/dialog_lib_symbol_properties.cpp
View File

@ -58,8 +58,7 @@ DIALOG_LIB_SYMBOL_PROPERTIES::DIALOG_LIB_SYMBOL_PROPERTIES( SYMBOL_EDIT_FRAME* a
m_delayedFocusGrid( nullptr ), m_delayedFocusGrid( nullptr ),
m_delayedFocusRow( -1 ), m_delayedFocusRow( -1 ),
m_delayedFocusColumn( -1 ), m_delayedFocusColumn( -1 ),
m_delayedFocusPage( -1 ), m_delayedFocusPage( -1 )
m_width( 0 )
{ {
// Give a bit more room for combobox editors // Give a bit more room for combobox editors
m_grid->SetDefaultRowSize( m_grid->GetDefaultRowSize() + 4 ); m_grid->SetDefaultRowSize( m_grid->GetDefaultRowSize() + 4 );
@ -789,11 +788,11 @@ void DIALOG_LIB_SYMBOL_PROPERTIES::OnUpdateUI( wxUpdateUIEvent& event )
void DIALOG_LIB_SYMBOL_PROPERTIES::OnSizeGrid( wxSizeEvent& event ) void DIALOG_LIB_SYMBOL_PROPERTIES::OnSizeGrid( wxSizeEvent& event )
{ {
auto new_size = event.GetSize().GetX(); auto new_size = event.GetSize();
if( new_size != m_width ) if( new_size != m_size )
{ {
m_width = new_size; m_size = new_size;
adjustGridColumns(); adjustGridColumns();
} }

2
eeschema/dialogs/dialog_lib_symbol_properties.h
View File

@ -90,7 +90,7 @@ public:
wxString m_delayedErrorMessage; wxString m_delayedErrorMessage;
wxString m_shownColumns; wxString m_shownColumns;
int m_width; wxSize m_size;
private: private:
static int m_lastOpenedPage; // To remember the last notebook selection static int m_lastOpenedPage; // To remember the last notebook selection

7
eeschema/dialogs/dialog_pin_properties.cpp
View File

@ -235,7 +235,6 @@ DIALOG_PIN_PROPERTIES::DIALOG_PIN_PROPERTIES( SYMBOL_EDIT_FRAME* parent, LIB_PIN
Raise(); Raise();
m_initialized = true; m_initialized = true;
m_width = 0;
} }
@ -473,11 +472,11 @@ void DIALOG_PIN_PROPERTIES::adjustGridColumns()
void DIALOG_PIN_PROPERTIES::OnSize( wxSizeEvent& event ) void DIALOG_PIN_PROPERTIES::OnSize( wxSizeEvent& event )
{ {
auto new_size = event.GetSize().GetX(); auto new_size = event.GetSize();
if( m_initialized && m_width != new_size ) if( m_initialized && m_size != new_size )
{ {
m_width = new_size; m_size = new_size;
adjustGridColumns(); adjustGridColumns();
} }

2
eeschema/dialogs/dialog_pin_properties.h
View File

@ -89,7 +89,7 @@ private:
int m_delayedFocusColumn; int m_delayedFocusColumn;
int m_originalColWidths[ COL_COUNT ]; int m_originalColWidths[ COL_COUNT ];
int m_width; wxSize m_size;
bool m_initialized; bool m_initialized;
}; };

2
eeschema/dialogs/dialog_sheet_properties.cpp
View File

@ -880,7 +880,7 @@ void DIALOG_SHEET_PROPERTIES::OnUpdateUI( wxUpdateUIEvent& event )
void DIALOG_SHEET_PROPERTIES::OnSizeGrid( wxSizeEvent& event ) void DIALOG_SHEET_PROPERTIES::OnSizeGrid( wxSizeEvent& event )
{ {
int new_size = event.GetSize(); auto new_size = event.GetSize();
if( m_size != new_size ) if( m_size != new_size )
{ {

2
eeschema/dialogs/dialog_sheet_properties.h
View File

@ -67,7 +67,7 @@ private:
SCH_SHEET* m_sheet; SCH_SHEET* m_sheet;
bool* m_clearAnnotationNewItems; bool* m_clearAnnotationNewItems;
int m_width; wxSize m_size;
int m_delayedFocusRow; int m_delayedFocusRow;
int m_delayedFocusColumn; int m_delayedFocusColumn;
wxString m_shownColumns; wxString m_shownColumns;

14
eeschema/dialogs/dialog_symbol_properties.cpp
View File

@ -292,8 +292,6 @@ DIALOG_SYMBOL_PROPERTIES::DIALOG_SYMBOL_PROPERTIES( SCH_EDIT_FRAME* aParent,
m_fields = new FIELDS_GRID_TABLE<SCH_FIELD>( this, aParent, m_fieldsGrid, m_part ); m_fields = new FIELDS_GRID_TABLE<SCH_FIELD>( this, aParent, m_fieldsGrid, m_part );
m_widthFields = 0;
m_widthPins = 0;
m_delayedFocusRow = REFERENCE_FIELD; m_delayedFocusRow = REFERENCE_FIELD;
m_delayedFocusColumn = FDC_VALUE; m_delayedFocusColumn = FDC_VALUE;
m_delayedSelection = true; m_delayedSelection = true;
@ -1078,11 +1076,11 @@ void DIALOG_SYMBOL_PROPERTIES::OnUpdateUI( wxUpdateUIEvent& event )
void DIALOG_SYMBOL_PROPERTIES::OnSizeFieldsGrid( wxSizeEvent& event ) void DIALOG_SYMBOL_PROPERTIES::OnSizeFieldsGrid( wxSizeEvent& event )
{ {
int new_size = event.GetSize().GetX(); wxSize new_size = event.GetSize();
if( m_widthFields != new_size ) if( m_fieldsSize != new_size )
{ {
m_widthFields = new_size; m_fieldsSize = new_size;
AdjustFieldsGridColumns(); AdjustFieldsGridColumns();
} }
@ -1094,11 +1092,11 @@ void DIALOG_SYMBOL_PROPERTIES::OnSizeFieldsGrid( wxSizeEvent& event )
void DIALOG_SYMBOL_PROPERTIES::OnSizePinsGrid( wxSizeEvent& event ) void DIALOG_SYMBOL_PROPERTIES::OnSizePinsGrid( wxSizeEvent& event )
{ {
int new_size = event.GetSize().GetX(); wxSize new_size = event.GetSize();
if( m_widthPins != new_size ) if( m_pinsSize != new_size )
{ {
m_widthPins = new_size; m_pinsSize = new_size;
AdjustPinsGridColumns(); AdjustPinsGridColumns();
} }

4
eeschema/dialogs/dialog_symbol_properties.h
View File

@ -96,8 +96,8 @@ private:
SCH_SYMBOL* m_symbol; SCH_SYMBOL* m_symbol;
LIB_SYMBOL* m_part; LIB_SYMBOL* m_part;
int m_widthFields; wxSize m_fieldsSize;
int m_widthPins; wxSize m_pinsSize;
int m_delayedFocusRow; int m_delayedFocusRow;
int m_delayedFocusColumn; int m_delayedFocusColumn;
bool m_delayedSelection; bool m_delayedSelection;

6
pcbnew/dialogs/dialog_net_inspector.cpp
View File

@ -1780,11 +1780,11 @@ void DIALOG_NET_INSPECTOR::adjustListColumns()
void DIALOG_NET_INSPECTOR::onListSize( wxSizeEvent& aEvent ) void DIALOG_NET_INSPECTOR::onListSize( wxSizeEvent& aEvent )
{ {
int width = aEvent.GetSize().x; auto new_size = aEvent.GetSize();
if( width != m_width ) if( new_size != m_size )
{ {
m_width = width; m_size = new_size;
adjustListColumns(); adjustListColumns();
} }

2
pcbnew/dialogs/dialog_net_inspector.h
View File

@ -125,7 +125,7 @@ private:
PCB_EDIT_FRAME* m_frame; PCB_EDIT_FRAME* m_frame;
bool m_in_build_nets_list = false; bool m_in_build_nets_list = false;
bool m_filter_change_no_rebuild = false; bool m_filter_change_no_rebuild = false;
int m_width = 0; wxSize m_size;
class DATA_MODEL; class DATA_MODEL;
wxObjectDataPtr<DATA_MODEL> m_data_model; wxObjectDataPtr<DATA_MODEL> m_data_model;