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

Cleanup parent usage in the ACTION_TOOLBAR 

When we look for icon scaling, we should be using the wxWidgets
parent as the scaling window not the tool manager's frame (even though
they are probably the same). (this also removes several dynamic_casts).
This commit is contained in:
Ian McInerney 2020-11-04 01:42:18 +00:00
parent 3d47eb0d49
commit 831d020544
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
common/tool/action_toolbar.cpp
View File

@ -199,12 +199,12 @@ ACTION_TOOLBAR::~ACTION_TOOLBAR()
void ACTION_TOOLBAR::Add( const TOOL_ACTION& aAction, bool aIsToggleEntry, bool aIsCancellable ) void ACTION_TOOLBAR::Add( const TOOL_ACTION& aAction, bool aIsToggleEntry, bool aIsCancellable )
{ {
wxASSERT( GetParent() );
wxASSERT_MSG( !( aIsCancellable && !aIsToggleEntry ), "aIsCancellable requires aIsToggleEntry" ); wxASSERT_MSG( !( aIsCancellable && !aIsToggleEntry ), "aIsCancellable requires aIsToggleEntry" );
wxWindow* parent = dynamic_cast<wxWindow*>( m_toolManager->GetToolHolder() );
int toolId = aAction.GetUIId(); int toolId = aAction.GetUIId();
AddTool( toolId, wxEmptyString, KiScaledBitmap( aAction.GetIcon(), parent ), AddTool( toolId, wxEmptyString, KiScaledBitmap( aAction.GetIcon(), GetParent() ),
aAction.GetDescription(), aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL ); aAction.GetDescription(), aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL );
m_toolKinds[ toolId ] = aIsToggleEntry; m_toolKinds[ toolId ] = aIsToggleEntry;
@ -215,10 +215,9 @@ void ACTION_TOOLBAR::Add( const TOOL_ACTION& aAction, bool aIsToggleEntry, bool
void ACTION_TOOLBAR::AddButton( const TOOL_ACTION& aAction ) void ACTION_TOOLBAR::AddButton( const TOOL_ACTION& aAction )
{ {
wxWindow* parent = dynamic_cast<wxWindow*>( m_toolManager->GetToolHolder() );
int toolId = aAction.GetUIId(); int toolId = aAction.GetUIId();
AddTool( toolId, wxEmptyString, KiScaledBitmap( aAction.GetIcon(), parent ), AddTool( toolId, wxEmptyString, KiScaledBitmap( aAction.GetIcon(), GetParent() ),
aAction.GetName(), wxITEM_NORMAL ); aAction.GetName(), wxITEM_NORMAL );
m_toolKinds[ toolId ] = false; m_toolKinds[ toolId ] = false;
@ -256,8 +255,8 @@ void ACTION_TOOLBAR::AddGroup( ACTION_GROUP* aGroup, bool aIsToggleEntry )
{ {
int groupId = aGroup->GetUIId(); int groupId = aGroup->GetUIId();
const TOOL_ACTION* defaultAction = aGroup->GetDefaultAction(); const TOOL_ACTION* defaultAction = aGroup->GetDefaultAction();
wxWindow* parent = dynamic_cast<wxWindow*>( m_toolManager->GetToolHolder() );
wxASSERT( GetParent() );
wxASSERT( defaultAction ); wxASSERT( defaultAction );
m_toolKinds[ groupId ] = aIsToggleEntry; m_toolKinds[ groupId ] = aIsToggleEntry;
@ -265,7 +264,7 @@ void ACTION_TOOLBAR::AddGroup( ACTION_GROUP* aGroup, bool aIsToggleEntry )
m_actionGroups[ groupId ] = aGroup; m_actionGroups[ groupId ] = aGroup;
// Add the main toolbar item representing the group // Add the main toolbar item representing the group
AddTool( groupId, wxEmptyString, KiScaledBitmap( defaultAction->GetIcon(), parent ), AddTool( groupId, wxEmptyString, KiScaledBitmap( defaultAction->GetIcon(), GetParent() ),
wxEmptyString, aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL ); wxEmptyString, aIsToggleEntry ? wxITEM_CHECK : wxITEM_NORMAL );
// Select the default action // Select the default action
@ -289,17 +288,18 @@ void ACTION_TOOLBAR::SelectAction( ACTION_GROUP* aGroup, const TOOL_ACTION& aAct
void ACTION_TOOLBAR::doSelectAction( ACTION_GROUP* aGroup, const TOOL_ACTION& aAction ) void ACTION_TOOLBAR::doSelectAction( ACTION_GROUP* aGroup, const TOOL_ACTION& aAction )
{ {
wxASSERT( GetParent() );
int groupId = aGroup->GetUIId(); int groupId = aGroup->GetUIId();
wxAuiToolBarItem* item = FindTool( groupId ); wxAuiToolBarItem* item = FindTool( groupId );
wxWindow* parent = dynamic_cast<wxWindow*>( m_toolManager->GetToolHolder() );
if( !item ) if( !item )
return; return;
// Update the item information // Update the item information
item->SetShortHelp( aAction.GetDescription() ); item->SetShortHelp( aAction.GetDescription() );
item->SetBitmap( KiScaledBitmap( aAction.GetIcon(), parent ) ); item->SetBitmap( KiScaledBitmap( aAction.GetIcon(), GetParent() ) );
item->SetDisabledBitmap( item->GetBitmap().ConvertToDisabled() ); item->SetDisabledBitmap( item->GetBitmap().ConvertToDisabled() );
// Register a new handler with the new UI conditions // Register a new handler with the new UI conditions
@ -550,10 +550,11 @@ void ACTION_TOOLBAR::popupPalette( wxAuiToolBarItem* aItem )
// Clear all popup conditions // Clear all popup conditions
m_paletteTimer->Stop(); m_paletteTimer->Stop();
wxWindow* parent = dynamic_cast<wxWindow*>( m_toolManager->GetToolHolder() ); wxWindow* toolParent = dynamic_cast<wxWindow*>( m_toolManager->GetToolHolder() );
wxASSERT( GetParent() );
wxASSERT( m_auiManager ); wxASSERT( m_auiManager );
wxASSERT( parent ); wxASSERT( toolParent );
// Ensure the item we are using for the palette has a group associated with it. // Ensure the item we are using for the palette has a group associated with it.
const auto it = m_actionGroups.find( aItem->GetId() ); const auto it = m_actionGroups.find( aItem->GetId() );
@ -617,7 +618,7 @@ void ACTION_TOOLBAR::popupPalette( wxAuiToolBarItem* aItem )
break; break;
} }
m_palette = new ACTION_TOOLBAR_PALETTE( parent, dir ); m_palette = new ACTION_TOOLBAR_PALETTE( GetParent(), dir );
// We handle the button events in the toolbar class, so connect the right handler // We handle the button events in the toolbar class, so connect the right handler
m_palette->SetGroup( group ); m_palette->SetGroup( group );
@ -631,7 +632,7 @@ void ACTION_TOOLBAR::popupPalette( wxAuiToolBarItem* aItem )
{ {
wxUpdateUIEvent evt( action->GetUIId() ); wxUpdateUIEvent evt( action->GetUIId() );
parent->ProcessWindowEvent( evt ); toolParent->ProcessWindowEvent( evt );
m_palette->AddAction( *action ); m_palette->AddAction( *action );