KiCad

Merge lp:~cern-kicad/kicad/selection_fix into lp:kicad/product

  1. selection_fix
  2. Merge into product
Proposed by Maciej Suminski
Status: Merged
Merged at revision: 4516
Proposed branch: lp:~cern-kicad/kicad/selection_fix
Merge into: lp:kicad/product
Diff against target: 31 lines (+3/-6)
2 files modified
pcbnew/basepcbframe.cpp (+3/-3)
pcbnew/tools/selection_tool.cpp (+0/-3)
To merge this branch: bzr merge lp:~cern-kicad/kicad/selection_fix
Reviewer Review Type Date Requested Status
KiCad Lead Developers Pending
Review via email: mp+197341@code.launchpad.net

Description of the change

Fixed disappearance of selected items after GAL switching.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'pcbnew/basepcbframe.cpp'
2--- pcbnew/basepcbframe.cpp 2013-11-02 00:24:38 +0000
3+++ pcbnew/basepcbframe.cpp 2013-12-02 10:42:27 +0000
4@@ -608,10 +608,10 @@
5 {
6 EDA_DRAW_FRAME::UseGalCanvas( aEnable );
7
8+ ViewReloadBoard( m_Pcb );
9+
10 m_toolManager->SetEnvironment( m_Pcb, m_galCanvas->GetView(),
11- m_galCanvas->GetViewControls(), this );
12-
13- ViewReloadBoard( m_Pcb );
14+ m_galCanvas->GetViewControls(), this );
15 }
16
17
18
19=== modified file 'pcbnew/tools/selection_tool.cpp'
20--- pcbnew/tools/selection_tool.cpp 2013-11-18 19:27:27 +0000
21+++ pcbnew/tools/selection_tool.cpp 2013-12-02 10:42:27 +0000
22@@ -67,9 +67,6 @@
23
24 void SELECTION_TOOL::Reset()
25 {
26- m_selection.group->Clear();
27- m_selection.items.clear();
28-
29 // Reinsert the VIEW_GROUP, in case it was removed from the VIEW
30 getView()->Remove( m_selection.group );
31 getView()->Add( m_selection.group );