FIX: [STUDIO-2967] dowload model file not work

Change-Id: Ie4cc2d43f7078b505261f51bac4a34079e2d4836
This commit is contained in:
chunmao.guo 2023-05-31 13:30:49 +08:00 committed by Lane.Wei
parent 81cb240dcc
commit 3b5ae871af
3 changed files with 5 additions and 2 deletions

View file

@ -456,7 +456,7 @@ struct MediaProgressDialog : ProgressDialog
std::function<void()> m_cancel; std::function<void()> m_cancel;
}; };
void Slic3r::GUI::MediaFilePanel::doAction(size_t index, int action) void MediaFilePanel::doAction(size_t index, int action)
{ {
auto fs = m_image_grid->GetFileSystem(); auto fs = m_image_grid->GetFileSystem();
if (action == 0) { if (action == 0) {
@ -502,8 +502,8 @@ void Slic3r::GUI::MediaFilePanel::doAction(size_t index, int action)
Slic3r::GUI::wxGetApp().plater()->update_print_required_data(config, model, plate_data_list, from_u8(file.name).ToStdString()); Slic3r::GUI::wxGetApp().plater()->update_print_required_data(config, model, plate_data_list, from_u8(file.name).ToStdString());
wxPostEvent(Slic3r::GUI::wxGetApp().plater(), SimpleEvent(EVT_PRINT_FROM_SDCARD_VIEW)); wxPostEvent(Slic3r::GUI::wxGetApp().plater(), SimpleEvent(EVT_PRINT_FROM_SDCARD_VIEW));
}); });
return;
} }
return;
} }
if (index != -1) { if (index != -1) {
auto &file = fs->GetFile(index); auto &file = fs->GetFile(index);

View file

@ -68,6 +68,8 @@ int ComboBox::GetSelection() const { return drop.GetSelection(); }
void ComboBox::SetSelection(int n) void ComboBox::SetSelection(int n)
{ {
if (n == drop.selection)
return;
drop.SetSelection(n); drop.SetSelection(n);
SetLabel(drop.GetValue()); SetLabel(drop.GetValue());
if (drop.selection >= 0) if (drop.selection >= 0)

View file

@ -95,6 +95,7 @@ void TextInput::SetLabel(const wxString& label)
void TextInput::SetIcon(const wxBitmap &icon) void TextInput::SetIcon(const wxBitmap &icon)
{ {
this->icon = ScalableBitmap();
this->icon.bmp() = icon; this->icon.bmp() = icon;
Rescale(); Rescale();
} }