solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Improve ScrollTo() when using wxDV_VARIABLE_LINE_HEIGHT

Browse source 
Calculate the last visible item based on item position instead of the
first visible row when using variable line heights.

Also extend the sample for testing EnsureVisible with item and column.

Closes #23102.

Closes #23128.
This commit is contained in:
Jens Göpfert 2023-01-10 15:36:02 +01:00 • committed by Vadim Zeitlin
parent 38bc9c2a8d
commit 842ca1e8b8
2 changed files with 82 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

18
samples/dataview/dataview.cpp
View file

@ -104,6 +104,7 @@ private:
void OnShowCurrent(wxCommandEvent& event);
void OnSetNinthCurrent(wxCommandEvent& event);
void OnChangeNinthTitle(wxCommandEvent& event);
void OnEnsureNinthAndSecondColumn(wxCommandEvent& event);
void OnPrependList(wxCommandEvent& event);
void OnDeleteList(wxCommandEvent& event);
@ -452,6 +453,7 @@ enum
ID_SHOW_CURRENT,
ID_SET_NINTH_CURRENT,
ID_CHANGE_NINTH_TITLE,
ID_ENSURE_NINTH_SECOND_COLUMN,
ID_PREPEND_LIST = 200,
ID_DELETE_LIST = 201,
@ -506,6 +508,7 @@ wxBEGIN_EVENT_TABLE(MyFrame, wxFrame)
EVT_BUTTON( ID_SHOW_CURRENT, MyFrame::OnShowCurrent )
EVT_BUTTON( ID_SET_NINTH_CURRENT, MyFrame::OnSetNinthCurrent )
EVT_BUTTON( ID_CHANGE_NINTH_TITLE, MyFrame::OnChangeNinthTitle )
EVT_BUTTON( ID_ENSURE_NINTH_SECOND_COLUMN, MyFrame::OnEnsureNinthAndSecondColumn )
EVT_BUTTON( ID_PREPEND_LIST, MyFrame::OnPrependList )
EVT_BUTTON( ID_DELETE_LIST, MyFrame::OnDeleteList )
@ -741,8 +744,15 @@ MyFrame::MyFrame(wxFrame *frame, const wxString &title, int x, int y, int w, int
BuildDataViewCtrl(fifthPanel, Page_VarHeight);
wxBoxSizer* button_sizer5 = new wxBoxSizer(wxHORIZONTAL);
button_sizer5->Add(
new wxButton(fifthPanel, ID_ENSURE_NINTH_SECOND_COLUMN,
"Make ninth symphony and second column visible"),
wxSizerFlags().DoubleBorder());
wxSizer *fifthPanelSz = new wxBoxSizer(wxVERTICAL);
fifthPanelSz->Add(m_ctrl[Page_VarHeight], 1, wxGROW | wxALL, 5);
fifthPanelSz->Add(button_sizer5);
fifthPanel->SetSizerAndFit(fifthPanelSz);
// page showing the indexed list model
@ -1588,6 +1598,14 @@ void MyFrame::OnChangeNinthTitle(wxCommandEvent& WXUNUSED(event))
m_music_model->ItemChanged(item);
}
void MyFrame::OnEnsureNinthAndSecondColumn(wxCommandEvent& WXUNUSED(event))
{
wxDataViewItem item(m_long_music_model->GetNinthItem());
m_ctrl[Page_VarHeight]->Select(item);
wxDataViewColumn *col = m_ctrl[Page_VarHeight]->GetColumn(1);
m_ctrl[Page_VarHeight]->EnsureVisible(item, col);
}
void MyFrame::OnValueChanged( wxDataViewEvent &event )
{
wxString title = m_music_model->GetTitle( event.GetItem() );