3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-11 08:47:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Factor out load_scaled_bitmap

Browse source
This commit is contained in:
Vojtech Kral 2019-04-09 14:18:03 +02:00
parent 64ce604ff4
commit c17e8602ed
6 changed files with 43 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/slic3r/GUI/Preset.cpp
View file

@ -799,16 +799,16 @@ bool PresetCollection::delete_current_preset()
return true;
}
bool PresetCollection::load_bitmap_default(const std::string &file_name)
void PresetCollection::load_bitmap_default(const std::string &file_name)
{
// return m_bitmap_main_frame->LoadFile(wxString::FromUTF8(Slic3r::var(file_name).c_str()), wxBITMAP_TYPE_PNG);
return load_scaled_bitmap(nullptr, &m_bitmap_main_frame, file_name); // FIXME: pass window ptr for proper scaling
// FIXME: pass window ptr for proper scaling
*m_bitmap_main_frame = create_scaled_bitmap(nullptr, file_name);
}
bool PresetCollection::load_bitmap_add(const std::string &file_name)
void PresetCollection::load_bitmap_add(const std::string &file_name)
{
// return m_bitmap_add->LoadFile(wxString::FromUTF8(Slic3r::var(file_name).c_str()), wxBITMAP_TYPE_PNG);
return load_scaled_bitmap(nullptr, &m_bitmap_add, file_name); // FIXME: pass window ptr for proper scaling
// FIXME: pass window ptr for proper scaling
*m_bitmap_add = create_scaled_bitmap(nullptr, file_name);
}
const Preset* PresetCollection::get_selected_preset_parent() const