Skip to content

K
kicad-source-mirror
Commit 726d772c authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Pcbnew: Fix a refresh issue when changing active layer (Windows only) 

Fix 2 very minor issues.
parent d53f6664
Hide whitespace changes
Inline Side-by-side
Showing with 119 additions and 158 deletions
pcbnew/sel_layer.cpp
View file @ 726d772c
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
~SELECT_LAYER_DIALOG() { }; ~SELECT_LAYER_DIALOG() { };
private: private:
void Sel_Layer( wxCommandEvent& event ); void OnLayerSelected( wxCommandEvent& event );
void OnCancelClick( wxCommandEvent& event ); void OnCancelClick( wxCommandEvent& event );
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
...@@ -39,9 +39,9 @@ private: ...@@ -39,9 +39,9 @@ private:
BEGIN_EVENT_TABLE( SELECT_LAYER_DIALOG, wxDialog ) BEGIN_EVENT_TABLE( SELECT_LAYER_DIALOG, wxDialog )
EVT_BUTTON( wxID_OK, SELECT_LAYER_DIALOG::Sel_Layer ) EVT_BUTTON( wxID_OK, SELECT_LAYER_DIALOG::OnLayerSelected )
EVT_BUTTON( wxID_CANCEL, SELECT_LAYER_DIALOG::OnCancelClick ) EVT_BUTTON( wxID_CANCEL, SELECT_LAYER_DIALOG::OnCancelClick )
EVT_RADIOBOX( ID_LAYER_SELECT, SELECT_LAYER_DIALOG::Sel_Layer ) EVT_RADIOBOX( ID_LAYER_SELECT, SELECT_LAYER_DIALOG::OnLayerSelected )
END_EVENT_TABLE() END_EVENT_TABLE()
...@@ -163,11 +163,15 @@ SELECT_LAYER_DIALOG::SELECT_LAYER_DIALOG( PCB_BASE_FRAME* parent, ...@@ -163,11 +163,15 @@ SELECT_LAYER_DIALOG::SELECT_LAYER_DIALOG( PCB_BASE_FRAME* parent,
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) ); Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
ButtonBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 ); ButtonBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
SetFocus();
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
Center();
} }
void SELECT_LAYER_DIALOG::Sel_Layer( wxCommandEvent& event ) void SELECT_LAYER_DIALOG::OnLayerSelected( wxCommandEvent& event )
{ {
int ii = m_LayerId[m_LayerList->GetSelection()]; int ii = m_LayerId[m_LayerList->GetSelection()];
...@@ -312,11 +316,10 @@ SELECT_LAYERS_PAIR_DIALOG::SELECT_LAYERS_PAIR_DIALOG( PCB_BASE_FRAME* parent ) : ...@@ -312,11 +316,10 @@ SELECT_LAYERS_PAIR_DIALOG::SELECT_LAYERS_PAIR_DIALOG( PCB_BASE_FRAME* parent ) :
Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) ); Button = new wxButton( this, wxID_CANCEL, _( "Cancel" ) );
ButtonBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 ); ButtonBoxSizer->Add( Button, 0, wxGROW | wxALL, 5 );
SetFocus();
if( GetSizer() ) GetSizer()->SetSizeHints( this );
{ Center();
GetSizer()->SetSizeHints( this );
}
} }
......
pcbnew/tool_pcb.cpp
View file @ 726d772c
...@@ -69,6 +69,7 @@ void PCB_EDIT_FRAME::PrepareLayerIndicator() ...@@ -69,6 +69,7 @@ void PCB_EDIT_FRAME::PrepareLayerIndicator()
int active_layer_color, Route_Layer_TOP_color, int active_layer_color, Route_Layer_TOP_color,
Route_Layer_BOTTOM_color, via_color; Route_Layer_BOTTOM_color, via_color;
bool change = false; bool change = false;
bool first_call = LayerPairBitmap == NULL;
static int previous_active_layer_color, previous_Route_Layer_TOP_color, static int previous_active_layer_color, previous_Route_Layer_TOP_color,
previous_Route_Layer_BOTTOM_color, previous_via_color; previous_Route_Layer_BOTTOM_color, previous_via_color;
...@@ -112,7 +113,7 @@ void PCB_EDIT_FRAME::PrepareLayerIndicator() ...@@ -112,7 +113,7 @@ void PCB_EDIT_FRAME::PrepareLayerIndicator()
if( !change && (LayerPairBitmap != NULL) ) if( !change && (LayerPairBitmap != NULL) )
return; return;
/* Create the bitmap too and its Memory DC, if not already made */ /* Create the bitmap and its Memory DC, if not already made */
if( LayerPairBitmap == NULL ) if( LayerPairBitmap == NULL )
{ {
LayerPairBitmap = new wxBitmap( 24, 24 ); LayerPairBitmap = new wxBitmap( 24, 24 );
...@@ -164,10 +165,10 @@ void PCB_EDIT_FRAME::PrepareLayerIndicator() ...@@ -164,10 +165,10 @@ void PCB_EDIT_FRAME::PrepareLayerIndicator()
* in order to delete the MemoryDC safely without deleting the bitmap */ * in order to delete the MemoryDC safely without deleting the bitmap */
iconDC.SelectObject( wxNullBitmap ); iconDC.SelectObject( wxNullBitmap );
if( m_HToolBar ) if( m_HToolBar && ! first_call )
{ {
m_HToolBar->SetToolBitmap( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, *LayerPairBitmap ); m_HToolBar->SetToolBitmap( ID_AUX_TOOLBAR_PCB_SELECT_LAYER_PAIR, *LayerPairBitmap );
m_HToolBar->Realize(); m_HToolBar->Refresh();
} }
} }
......
template/kicad.pro
View file @ 726d772c
update=20/11/2008-19:07:03 update=19/09/2011 08:20:40
version=1 version=1
last_client=eeschema last_client=pcbnew
[general] [general]
version=1 version=1
RootSch= RootSch=
BoardNm= BoardNm=
[cvpcb] [eeschema]
version=1 version=1
NetITyp=0 LibDir=
NetIExt=.net NetFmt=1
PkgIExt=.pkg HPGLSpd=20
NetDir= HPGLDm=15
LibDir= HPGLNum=1
NetType=0 offX_A4=0
[cvpcb/libraries] offY_A4=0
EquName1=devcms offX_A3=0
[pcbnew] offY_A3=0
version=1 offX_A2=0
PadDrlX=320 offY_A2=0
PadDimH=600 offX_A1=0
PadDimV=600 offY_A1=0
PadForm=1 offX_A0=0
PadMask=14745599 offY_A0=0
ViaDiam=450 offX_A=0
ViaDril=250 offY_A=0
Isol=60 offX_B=0
Countlayer=2 offY_B=0
Lpiste=170 offX_C=0
RouteTo=15 offY_C=0
RouteBo=0 offX_D=0
TypeVia=3 offY_D=0
Segm45=1 offX_E=0
Racc45=1 offY_E=0
Unite=0 RptD_X=0
SegFill=1 RptD_Y=100
SegAffG=0 RptLab=1
NewAffG=1 LabSize=60
PadFill=1 [eeschema/libraries]
PadAffG=1 LibName1=power
PadSNum=1 LibName2=device
ModAffC=0 LibName3=transistors
ModAffT=0 LibName4=conn
PcbAffT=0 LibName5=linear
SgPcb45=1 LibName6=regul
TxtPcbV=800 LibName7=74xx
TxtPcbH=600 LibName8=cmos4000
TxtModV=600 LibName9=adc-dac
TxtModH=600 LibName10=memory
TxtModW=120 LibName11=xilinx
HPGLnum=1 LibName12=special
HPGdiam=15 LibName13=microcontrollers
HPGLSpd=20 LibName14=dsp
HPGLrec=2 LibName15=microchip
HPGLorg=0 LibName16=analog_switches
GERBmin=15 LibName17=motorola
VEgarde=100 LibName18=texas
DrawLar=150 LibName19=intel
EdgeLar=150 LibName20=audio
TxtLar=120 LibName21=interface
MSegLar=150 LibName22=digital-audio
ForPlot=1 LibName23=philips
WpenSer=10 LibName24=display
UserGrX=0,01 LibName25=cypress
UserGrY=0,01 LibName26=siliconi
UserGrU=1 LibName27=opto
DivGrPc=1 LibName28=atmel
TimeOut=600 LibName29=contrib
MaxLnkS=3 LibName30=valves
ShowRat=0 [cvpcb]
ShowMRa=1 version=1
[pcbnew/libraries] NetIExt=net
LibDir= [cvpcb/libraries]
LibName1=sockets EquName1=devcms
LibName2=connect [pcbnew]
LibName3=discret version=1
LibName4=pin_array PadDrlX=320
LibName5=divers PadDimH=600
LibName6=libcms PadDimV=600
LibName7=display BoardThickness=630
LibName8=valves TxtPcbV=800
LibName9=led TxtPcbH=600
LibName10=dip_sockets TxtModV=600
[eeschema] TxtModH=600
version=1 TxtModW=120
LibDir= VEgarde=100
NetFmt=1 DrawLar=150
HPGLSpd=20 EdgeLar=150
HPGLDm=15 TxtLar=120
HPGLNum=1 MSegLar=150
offX_A4=0 LastNetListRead=
offY_A4=0 [pcbnew/libraries]
offX_A3=0 LibDir=
offY_A3=0 LibName1=sockets
offX_A2=0 LibName2=connect
offY_A2=0 LibName3=discret
offX_A1=0 LibName4=pin_array
offY_A1=0 LibName5=divers
offX_A0=0 LibName6=libcms
offY_A0=0 LibName7=display
offX_A=0 LibName8=led
offY_A=0 LibName9=dip_sockets
offX_B=0 LibName10=pga_sockets
offY_B=0 LibName11=valves
offX_C=0
offY_C=0
offX_D=0
offY_D=0
offX_E=0
offY_E=0
RptD_X=0
RptD_Y=100
RptLab=1
SimCmd=
UseNetN=0
LabSize=60
[eeschema/libraries]
LibName1=power
LibName2=device
LibName3=transistors
LibName4=conn
LibName5=linear
LibName6=regul
LibName7=74xx
LibName8=cmos4000
LibName9=adc-dac
LibName10=memory
LibName11=xilinx
LibName12=special
LibName13=microcontrollers
LibName14=dsp
LibName15=microchip
LibName16=analog_switches
LibName17=motorola
LibName18=texas
LibName19=intel
LibName20=audio
LibName21=interface
LibName22=digital-audio
LibName23=philips
LibName24=display
LibName25=cypress
LibName26=siliconi
LibName27=opto
LibName28=atmel
LibName29=contrib
LibName30=valves
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment