From b86be7e9bfd055e1e48d2a33e829bb2f65562809 Mon Sep 17 00:00:00 2001 From: enricoturri1966 Date: Mon, 29 Nov 2021 15:00:08 +0100 Subject: [PATCH] Replace mirroring_transparent.png with transparent.png --- src/slic3r/GUI/GUI_ObjectManipulation.cpp | 4 ++++ src/slic3r/GUI/Plater.cpp | 12 +++++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/slic3r/GUI/GUI_ObjectManipulation.cpp b/src/slic3r/GUI/GUI_ObjectManipulation.cpp index 201e5d78d7..f6eb4d662b 100644 --- a/src/slic3r/GUI/GUI_ObjectManipulation.cpp +++ b/src/slic3r/GUI/GUI_ObjectManipulation.cpp @@ -112,7 +112,11 @@ ObjectManipulation::ObjectManipulation(wxWindow* parent) : // Load bitmaps to be used for the mirroring buttons: m_mirror_bitmap_on = ScalableBitmap(parent, "mirroring_on"); m_mirror_bitmap_off = ScalableBitmap(parent, "mirroring_off"); +#if ENABLE_TEXTURED_VOLUMES + m_mirror_bitmap_hidden = ScalableBitmap(parent, "transparent.png"); +#else m_mirror_bitmap_hidden = ScalableBitmap(parent, "mirroring_transparent.png"); +#endif // ENABLE_TEXTURED_VOLUMES const int border = wxOSX ? 0 : 4; const int em = wxGetApp().em_unit(); diff --git a/src/slic3r/GUI/Plater.cpp b/src/slic3r/GUI/Plater.cpp index 39bb9bf23c..c593d639d4 100644 --- a/src/slic3r/GUI/Plater.cpp +++ b/src/slic3r/GUI/Plater.cpp @@ -443,7 +443,12 @@ FreqChangedParams::FreqChangedParams(wxWindow* parent) : */ auto empty_widget = [this] (wxWindow* parent) { auto sizer = new wxBoxSizer(wxHORIZONTAL); +#if ENABLE_TEXTURED_VOLUMES + // when setting tech ENABLE_TEXTURED_VOLUMES to default remove file mirroring_transparent.png from /resources/icons folder + auto btn = new ScalableButton(parent, wxID_ANY, "transparent.png", wxEmptyString, +#else auto btn = new ScalableButton(parent, wxID_ANY, "mirroring_transparent.png", wxEmptyString, +#endif // ENABLE_TEXTURED_VOLUMES wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER | wxTRANSPARENT_WINDOW); sizer->Add(btn, 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, int(0.3 * wxGetApp().em_unit())); m_empty_buttons.push_back(btn); @@ -500,8 +505,13 @@ FreqChangedParams::FreqChangedParams(wxWindow* parent) : } })); +#if ENABLE_TEXTURED_VOLUMES + // when setting tech ENABLE_TEXTURED_VOLUMES to default remove file mirroring_transparent.png from /resources/icons folder + auto btn = new ScalableButton(parent, wxID_ANY, "transparent.png", wxEmptyString, +#else auto btn = new ScalableButton(parent, wxID_ANY, "mirroring_transparent.png", wxEmptyString, - wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER | wxTRANSPARENT_WINDOW); +#endif // ENABLE_TEXTURED_VOLUMES + wxDefaultSize, wxDefaultPosition, wxBU_EXACTFIT | wxNO_BORDER | wxTRANSPARENT_WINDOW); sizer->Add(btn , 0, wxALIGN_CENTER_VERTICAL | wxLEFT | wxRIGHT, int(0.3 * wxGetApp().em_unit())); m_empty_buttons.push_back(btn);