Move lock checks to CLIENT_SELECTION_FILTER.

Also checks render item visibility as well as layer visibility
when making selections.

Fixes: lp:1066220
* https://bugs.launchpad.net/kicad/+bug/1066220

Fixes: lp:1541756
* https://bugs.launchpad.net/kicad/+bug/1541756
This commit is contained in:
Jeff Young
2018-09-25 17:56:38 +01:00
parent 686f1b878b
commit 37f7faf433
16 changed files with 162 additions and 247 deletions
+7
View File
@@ -262,11 +262,13 @@ NET_SELECTOR::NET_SELECTOR( wxWindow *parent, wxWindowID id,
m_netSelectorPopup( nullptr )
{ }
void NET_SELECTOR::DoSetPopupControl( wxComboPopup* aPopup )
{
m_popup = nullptr;
}
void NET_SELECTOR::OnButtonClick()
{
wxRect comboRect = GetScreenRect();
@@ -287,11 +289,13 @@ void NET_SELECTOR::OnButtonClick()
SetSelectedNetcode( popup->GetSelectedNetcode() );
}
void NET_SELECTOR::SetNetInfo( NETINFO_LIST* aNetInfoList )
{
m_netinfoList = aNetInfoList;
}
void NET_SELECTOR::SetSelectedNetcode( int aNetcode )
{
m_netcode = aNetcode;
@@ -311,17 +315,20 @@ void NET_SELECTOR::SetSelectedNetcode( int aNetcode )
}
}
void NET_SELECTOR::SetIndeterminate()
{
m_netcode = -1;
SetValue( INDETERMINATE );
}
bool NET_SELECTOR::IsIndeterminate()
{
return m_netcode == -1;
}
int NET_SELECTOR::GetSelectedNetcode()
{
return m_netcode;