mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: [STUDIO-2447] ImageGroid: clear scroll offset on list changed 

Change-Id: I8c2b2bfed096e99e2223ff109e5d70ea2bc3a82a
This commit is contained in:
chunmao.guo 2023-03-10 17:30:30 +08:00 committed by Lane.Wei
parent 84580f6f94
commit 6ee93d5646
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/slic3r/GUI/ImageGrid.cpp
View File

@ -69,6 +69,7 @@ void ImageGrid::SetFileSystem(boost::shared_ptr<PrinterFileSystem> file_sys)
m_row_count = 0; m_row_count = 0;
m_col_count = 1; m_col_count = 1;
m_row_offset = 0; m_row_offset = 0;
m_scroll_offset = 0;
UpdateFileSystem(); UpdateFileSystem();
} }
@ -103,6 +104,7 @@ void Slic3r::GUI::ImageGrid::SetGroupMode(int mode)
m_row_offset = index / m_col_count * 4; m_row_offset = index / m_col_count * 4;
if (m_row_offset >= m_row_count) if (m_row_offset >= m_row_count)
m_row_offset = m_row_count == 0 ? 0 : m_row_count - 1; m_row_offset = m_row_count == 0 ? 0 : m_row_count - 1;
m_scroll_offset = 0;
} }
void Slic3r::GUI::ImageGrid::SetSelecting(bool selecting) void Slic3r::GUI::ImageGrid::SetSelecting(bool selecting)
@ -141,6 +143,7 @@ void Slic3r::GUI::ImageGrid::Select(size_t index)
m_row_offset = index / m_col_count * 4; m_row_offset = index / m_col_count * 4;
if (m_row_offset >= m_row_count) if (m_row_offset >= m_row_count)
m_row_offset = m_row_count == 0 ? 0 : m_row_count - 1; m_row_offset = m_row_count == 0 ? 0 : m_row_count - 1;
m_scroll_offset = 0;
Refresh(); Refresh();
} }
@ -244,6 +247,7 @@ void ImageGrid::UpdateLayout()
m_row_count = nrow > 0 ? nrow + 1 : 0; m_row_count = nrow > 0 ? nrow + 1 : 0;
if (m_row_offset >= m_row_count) if (m_row_offset >= m_row_count)
m_row_offset = m_row_count == 0 ? 0 : m_row_count - 1; m_row_offset = m_row_count == 0 ? 0 : m_row_count - 1;
m_scroll_offset = 0;
// create mask // create mask
if (m_file_sys->GetGroupMode() == PrinterFileSystem::G_NONE) { if (m_file_sys->GetGroupMode() == PrinterFileSystem::G_NONE) {
mask_size.x = (m_col_count - 1) * m_cell_size.GetWidth() + m_image_size.GetWidth(); mask_size.x = (m_col_count - 1) * m_cell_size.GetWidth() + m_image_size.GetWidth();
@ -382,13 +386,14 @@ void ImageGrid::resize(wxSizeEvent& event)
void ImageGrid::mouseWheelMoved(wxMouseEvent &event) void ImageGrid::mouseWheelMoved(wxMouseEvent &event)
{ {
auto delta = -event.GetWheelRotation(); auto delta = -event.GetWheelRotation();
m_scroll_offset += delta; m_scroll_offset += delta * 4;
int max = m_row_count * m_cell_size.GetHeight() / 4; delta = m_scroll_offset / m_cell_size.GetHeight();
if (m_scroll_offset < 0) m_row_offset += delta;
m_scroll_offset = 0; if (m_row_offset < 0)
else if (m_scroll_offset >= max) m_row_offset = 0;
m_scroll_offset = max - 1; else if (m_row_offset >= m_row_count)
m_row_offset = m_scroll_offset * 4 / m_cell_size.GetHeight(); m_row_offset = m_row_count == 0 ? 0 : m_row_count - 1;
m_scroll_offset -= delta * m_cell_size.GetHeight();
m_timer.StartOnce(4000); // Show position bar m_timer.StartOnce(4000); // Show position bar
UpdateFocusRange(); UpdateFocusRange();
Refresh(); Refresh();