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

Pcbnew: allows access Layers context menu when right clicking from below layers list 

Fixes #6614
https://gitlab.com/kicad/code/kicad/issues/6614
This commit is contained in:
jean-pierre charras 2021-06-11 09:32:47 +02:00
parent d8b1e827c7
commit 5492fafdf4
2 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
pcbnew/widgets/appearance_controls.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2020 Jon Evans <jon@craftyjon.com> * Copyright (C) 2020 Jon Evans <jon@craftyjon.com>
* Copyright (C) 2020 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2021 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software: you can redistribute it and/or modify it * This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the * under the terms of the GNU General Public License as published by the
@ -1429,10 +1429,10 @@ void APPEARANCE_CONTROLS::rebuildLayers()
aSetting->ctl_color = swatch; aSetting->ctl_color = swatch;
aSetting->ctl_text = label; aSetting->ctl_text = label;
panel->Bind( wxEVT_LEFT_DOWN, &APPEARANCE_CONTROLS::onLayerClick, this ); panel->Bind( wxEVT_LEFT_DOWN, &APPEARANCE_CONTROLS::onLayerLeftClick, this );
indicator->Bind( wxEVT_LEFT_DOWN, &APPEARANCE_CONTROLS::onLayerClick, this ); indicator->Bind( wxEVT_LEFT_DOWN, &APPEARANCE_CONTROLS::onLayerLeftClick, this );
swatch->Bind( wxEVT_LEFT_DOWN, &APPEARANCE_CONTROLS::onLayerClick, this ); swatch->Bind( wxEVT_LEFT_DOWN, &APPEARANCE_CONTROLS::onLayerLeftClick, this );
label->Bind( wxEVT_LEFT_DOWN, &APPEARANCE_CONTROLS::onLayerClick, this ); label->Bind( wxEVT_LEFT_DOWN, &APPEARANCE_CONTROLS::onLayerLeftClick, this );
btn_visible->Bind( TOGGLE_CHANGED, btn_visible->Bind( TOGGLE_CHANGED,
[&]( wxCommandEvent& aEvent ) [&]( wxCommandEvent& aEvent )
@ -1459,21 +1459,17 @@ void APPEARANCE_CONTROLS::rebuildLayers()
this ) ); this ) );
swatch->SetReadOnly( readOnly ); swatch->SetReadOnly( readOnly );
auto rightClickHandler = panel->Bind( wxEVT_RIGHT_DOWN, &APPEARANCE_CONTROLS::rightClickHandler, this );
[&]( wxMouseEvent& aEvent ) indicator->Bind( wxEVT_RIGHT_DOWN, &APPEARANCE_CONTROLS::rightClickHandler, this );
{ swatch->Bind( wxEVT_RIGHT_DOWN, &APPEARANCE_CONTROLS::rightClickHandler, this );
wxASSERT( m_layerContextMenu ); btn_visible->Bind( wxEVT_RIGHT_DOWN, &APPEARANCE_CONTROLS::rightClickHandler, this );
PopupMenu( m_layerContextMenu ); label->Bind( wxEVT_RIGHT_DOWN, &APPEARANCE_CONTROLS::rightClickHandler, this );
passOnFocus();
};
panel->Bind( wxEVT_RIGHT_DOWN, rightClickHandler );
indicator->Bind( wxEVT_RIGHT_DOWN, rightClickHandler );
swatch->Bind( wxEVT_RIGHT_DOWN, rightClickHandler );
btn_visible->Bind( wxEVT_RIGHT_DOWN, rightClickHandler );
label->Bind( wxEVT_RIGHT_DOWN, rightClickHandler );
}; };
// Add right click handling to show the conterxt menu when clicking to the free area in
// m_windowLayers (below the layer items)
m_windowLayers->Bind( wxEVT_RIGHT_DOWN, &APPEARANCE_CONTROLS::rightClickHandler, this );
wxString dsc; wxString dsc;
// show all coppers first, with front on top, back on bottom, then technical layers // show all coppers first, with front on top, back on bottom, then technical layers
@ -1779,7 +1775,7 @@ void APPEARANCE_CONTROLS::syncColorsAndVisibility()
} }
void APPEARANCE_CONTROLS::onLayerClick( wxMouseEvent& aEvent ) void APPEARANCE_CONTROLS::onLayerLeftClick( wxMouseEvent& aEvent )
{ {
auto eventSource = static_cast<wxWindow*>( aEvent.GetEventObject() ); auto eventSource = static_cast<wxWindow*>( aEvent.GetEventObject() );
@ -1793,6 +1789,14 @@ void APPEARANCE_CONTROLS::onLayerClick( wxMouseEvent& aEvent )
} }
void APPEARANCE_CONTROLS::rightClickHandler( wxMouseEvent& aEvent )
{
wxASSERT( m_layerContextMenu );
PopupMenu( m_layerContextMenu );
passOnFocus();
};
void APPEARANCE_CONTROLS::onLayerVisibilityChanged( PCB_LAYER_ID aLayer, bool isVisible, void APPEARANCE_CONTROLS::onLayerVisibilityChanged( PCB_LAYER_ID aLayer, bool isVisible,
bool isFinal ) bool isFinal )
{ {

4
pcbnew/widgets/appearance_controls.h
View File

@ -311,7 +311,9 @@ private:
void syncLayerPresetSelection(); void syncLayerPresetSelection();
void onLayerClick( wxMouseEvent& aEvent ); void onLayerLeftClick( wxMouseEvent& aEvent );
void rightClickHandler( wxMouseEvent& aEvent );
void onLayerVisibilityChanged( PCB_LAYER_ID aLayer, bool isVisible, bool isFinal ); void onLayerVisibilityChanged( PCB_LAYER_ID aLayer, bool isVisible, bool isFinal );