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

FIX: [STUDIO-1172] keep file download progress shown 

Change-Id: Idac86b4d4f03fe4fa9120353d185b6592123b980
This commit is contained in:
chunmao.guo 2022-11-15 14:41:05 +08:00 committed by Lane.Wei
parent 67fd44c551
commit 95fe7fc528
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -187,8 +187,6 @@ void Slic3r::GUI::ImageGrid::DoAction(size_t index, int action)
openFolderForFile(from_u8(file.path)); openFolderForFile(from_u8(file.path));
#else #else
#endif #endif
} else {
m_file_sys->DownloadCancel(index);
} }
return; return;
} }
@ -288,7 +286,7 @@ std::pair<int, size_t> Slic3r::GUI::ImageGrid::HitTest(wxPoint const &pt)
if (!m_selecting) { if (!m_selecting) {
wxRect hover_rect{0, m_image_size.y - 40, m_image_size.GetWidth(), 40}; wxRect hover_rect{0, m_image_size.y - 40, m_image_size.GetWidth(), 40};
auto & file = m_file_sys->GetFile(index); auto & file = m_file_sys->GetFile(index);
int btn = file.IsDownload() && file.progress >= 100 ? 3 : 2; int btn = file.IsDownload() && file.progress >= 0 ? 3 : 2;
if (hover_rect.Contains(off.x, off.y)) { return {HIT_ACTION, index * 4 + off.x * btn / hover_rect.GetWidth()}; } // Two buttons if (hover_rect.Contains(off.x, off.y)) { return {HIT_ACTION, index * 4 + off.x * btn / hover_rect.GetWidth()}; } // Two buttons
} }
return {HIT_ITEM, index}; return {HIT_ITEM, index};
@ -545,6 +543,7 @@ void ImageGrid::render(wxDC& dc)
} else { } else {
secondAction = _L("Cancel"); secondAction = _L("Cancel");
nonHoverText = wxString::Format(_L("Downloading %d%%..."), file.progress); nonHoverText = wxString::Format(_L("Downloading %d%%..."), file.progress);
thirdAction = wxString::Format(L"%d%%...", file.progress);
} }
} }
// Draw buttons on hovered item // Draw buttons on hovered item