cheng/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some fixes for wxSlider in widgets sample

Browse Source 
Correctly save the slider value before recreating the slider.
Layout the entire page instead of only the slider sizer.
Update the text controls after recreating the slider.
Always enable 'both sides' checkbox. It has additional effects in wxMSW.
This commit is contained in:
Maarten Bent 2019-01-31 20:39:15 +01:00
parent 56c7eadc0a
commit 53af5cb251
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
samples/widgets/slider.cpp
View File

@ -352,9 +352,6 @@ void SliderWidgetsPage::CreateContent()
Reset();
CreateSlider();
m_textLineSize->SetValue(wxString::Format("%d", m_slider->GetLineSize()));
m_textPageSize->SetValue(wxString::Format("%d", m_slider->GetPageSize()));
// the 3 panes panes compose the window
sizerTop->Add(sizerLeft,
wxSizerFlags(0).Expand().Border((wxALL & ~wxLEFT), 10));
@ -444,7 +441,7 @@ void SliderWidgetsPage::CreateSlider()
if ( m_slider )
{
int valOld = m_slider->GetValue();
if ( !IsValidValue(valOld) )
if ( IsValidValue(valOld) )
{
val = valOld;
}
@ -477,12 +474,16 @@ void SliderWidgetsPage::CreateSlider()
m_sizerSlider->Add(m_slider, wxSizerFlags(1).Centre().Border());
}
m_textLineSize->SetValue(wxString::Format("%d", m_slider->GetLineSize()));
m_textPageSize->SetValue(wxString::Format("%d", m_slider->GetPageSize()));
m_textThumbLen->SetValue(wxString::Format("%d", m_slider->GetThumbLength()));
if ( m_chkTicks->GetValue() )
{
DoSetTickFreq();
}
m_sizerSlider->Layout();
Layout();
}
void SliderWidgetsPage::DoSetLineSize()
@ -694,7 +695,7 @@ void SliderWidgetsPage::OnUpdateUIRadioSides(wxUpdateUIEvent& event)
void SliderWidgetsPage::OnUpdateUIBothSides(wxUpdateUIEvent& event)
{
#if defined(__WXMSW__) || defined(__WXUNIVERSAL__)
event.Enable( m_chkTicks->GetValue() );
event.Enable( true );
#else
event.Enable( false );
#endif // defined(__WXMSW__) || defined(__WXUNIVERSAL__)