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

Revert high DPI bitmaps in Preset and PresetBundle for now

Browse source 
due to bugs in wxBitmapComboBox et al.
This commit is contained in:
Vojtech Kral 2019-04-12 10:57:30 +02:00
parent 360e741462
commit 2fe63e0b04
2 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -801,12 +801,16 @@ bool PresetCollection::delete_current_preset()
void PresetCollection::load_bitmap_default(wxWindow *window, const std::string &file_name) void PresetCollection::load_bitmap_default(wxWindow *window, const std::string &file_name)
{ {
*m_bitmap_main_frame = create_scaled_bitmap(window, file_name); // XXX: See note in PresetBundle::load_compatible_bitmaps()
(void)window;
*m_bitmap_main_frame = create_scaled_bitmap(nullptr, file_name);
} }
void PresetCollection::load_bitmap_add(wxWindow *window, const std::string &file_name) void PresetCollection::load_bitmap_add(wxWindow *window, const std::string &file_name)
{ {
*m_bitmap_add = create_scaled_bitmap(window, file_name); // XXX: See note in PresetBundle::load_compatible_bitmaps()
(void)window;
*m_bitmap_add = create_scaled_bitmap(nullptr, file_name);
} }
const Preset* PresetCollection::get_selected_preset_parent() const const Preset* PresetCollection::get_selected_preset_parent() const

15
src/slic3r/GUI/PresetBundle.cpp
View file

@ -398,10 +398,17 @@ void PresetBundle::export_selections(AppConfig &config)
void PresetBundle::load_compatible_bitmaps(wxWindow *window) void PresetBundle::load_compatible_bitmaps(wxWindow *window)
{ {
*m_bitmapCompatible = create_scaled_bitmap(window, "flag_green"); // We don't actually pass the window pointer here and instead generate
*m_bitmapIncompatible = create_scaled_bitmap(window, "flag_red"); // a low DPI bitmap, because the wxBitmapComboBox and wxDataViewControl don't support
*m_bitmapLock = create_scaled_bitmap(window, "lock_closed"); // high DPI bitmaps very well, they compute their dimensions wrong.
*m_bitmapLockOpen = create_scaled_bitmap(window, "sys_unlock.png"); // TODO: Update this when fixed in wxWidgets
// See also PresetCollection::load_bitmap_default() and PresetCollection::load_bitmap_add()
(void)window;
*m_bitmapCompatible = create_scaled_bitmap(nullptr, "flag_green");
*m_bitmapIncompatible = create_scaled_bitmap(nullptr, "flag_red");
*m_bitmapLock = create_scaled_bitmap(nullptr, "lock_closed");
*m_bitmapLockOpen = create_scaled_bitmap(nullptr, "sys_unlock.png");
prints .set_bitmap_compatible(m_bitmapCompatible); prints .set_bitmap_compatible(m_bitmapCompatible);
filaments .set_bitmap_compatible(m_bitmapCompatible); filaments .set_bitmap_compatible(m_bitmapCompatible);