3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Changed icons for lock/unlock filament_presets on Plater tab

Browse source 
Experiment with filament_presets transparency on GTK
This commit is contained in:
YuSanka 2018-04-11 15:35:04 +02:00
parent 762306d985
commit 723bd22b96
2 changed files with 6 additions and 3 deletions

5
xs/src/slic3r/GUI/BitmapCache.cpp
View file

@ -88,7 +88,10 @@ wxBitmap* BitmapCache::insert(const std::string &bitmap_key, std::vector<wxBitma
wxMemoryDC memDC; wxMemoryDC memDC;
memDC.SelectObject(*bitmap); memDC.SelectObject(*bitmap);
memDC.SetBackground(*wxTRANSPARENT_BRUSH); #ifdef __WXGTK__
#else
memDC.SetBackground(*wxTRANSPARENT_BRUSH);
#endif
memDC.Clear(); memDC.Clear();
size_t x = 0; size_t x = 0;
for (wxBitmap &bmp : bmps) { for (wxBitmap &bmp : bmps) {

4
xs/src/slic3r/GUI/PresetBundle.cpp
View file

@ -254,8 +254,8 @@ bool PresetBundle::load_compatible_bitmaps()
{ {
const std::string path_bitmap_compatible = "flag-green-icon.png"; const std::string path_bitmap_compatible = "flag-green-icon.png";
const std::string path_bitmap_incompatible = "flag-red-icon.png"; const std::string path_bitmap_incompatible = "flag-red-icon.png";
const std::string path_bitmap_lock = "lock.png"; const std::string path_bitmap_lock = "sys_lock.png";//"lock.png";
const std::string path_bitmap_lock_open = "lock_open.png"; const std::string path_bitmap_lock_open = "sys_unlock.png";//"lock_open.png";
bool loaded_compatible = m_bitmapCompatible ->LoadFile( bool loaded_compatible = m_bitmapCompatible ->LoadFile(
wxString::FromUTF8(Slic3r::var(path_bitmap_compatible).c_str()), wxBITMAP_TYPE_PNG); wxString::FromUTF8(Slic3r::var(path_bitmap_compatible).c_str()), wxBITMAP_TYPE_PNG);
bool loaded_incompatible = m_bitmapIncompatible->LoadFile( bool loaded_incompatible = m_bitmapIncompatible->LoadFile(