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

Implemented a highlighting of the delete button for setting (related to #1767)

Browse source
This commit is contained in:
YuSanka 2019-07-29 15:13:17 +02:00
parent fca2fc0d97
commit e469ee76b8
2 changed files with 8 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/slic3r/GUI/GUI_ObjectSettings.cpp
View file

@ -61,6 +61,7 @@ ObjectSettings::ObjectSettings(wxWindow* parent) :
m_og->sizer->Add(m_settings_list_sizer, 1, wxEXPAND | wxLEFT, 5); m_og->sizer->Add(m_settings_list_sizer, 1, wxEXPAND | wxLEFT, 5);
m_bmp_delete = ScalableBitmap(parent, "cross"); m_bmp_delete = ScalableBitmap(parent, "cross");
m_bmp_delete_focus = ScalableBitmap(parent, "cross_focus");
} }
bool ObjectSettings::update_settings_list() bool ObjectSettings::update_settings_list()
@ -92,6 +93,9 @@ bool ObjectSettings::update_settings_list()
auto btn = new ScalableButton(parent, wxID_ANY, m_bmp_delete); auto btn = new ScalableButton(parent, wxID_ANY, m_bmp_delete);
btn->SetToolTip(_(L("Remove parameter"))); btn->SetToolTip(_(L("Remove parameter")));
btn->SetBitmapFocus(m_bmp_delete_focus.bmp());
btn->SetBitmapHover(m_bmp_delete_focus.bmp());
btn->Bind(wxEVT_BUTTON, [opt_key, config, this](wxEvent &event) { btn->Bind(wxEVT_BUTTON, [opt_key, config, this](wxEvent &event) {
wxGetApp().plater()->take_snapshot(wxString::Format(_(L("Delete Option %s")), opt_key)); wxGetApp().plater()->take_snapshot(wxString::Format(_(L("Delete Option %s")), opt_key));
config->erase(opt_key); config->erase(opt_key);
@ -122,6 +126,8 @@ bool ObjectSettings::update_settings_list()
if (ctrl == nullptr) if (ctrl == nullptr)
return; return;
ctrl->SetBitmap_(m_bmp_delete); ctrl->SetBitmap_(m_bmp_delete);
ctrl->SetBitmapFocus(m_bmp_delete_focus.bmp());
ctrl->SetBitmapHover(m_bmp_delete_focus.bmp());
}; };
const bool is_extruders_cat = cat.first == "Extruders"; const bool is_extruders_cat = cat.first == "Extruders";
@ -166,6 +172,7 @@ void ObjectSettings::UpdateAndShow(const bool show)
void ObjectSettings::msw_rescale() void ObjectSettings::msw_rescale()
{ {
m_bmp_delete.msw_rescale(); m_bmp_delete.msw_rescale();
m_bmp_delete_focus.msw_rescale();
for (auto group : m_og_settings) for (auto group : m_og_settings)
group->msw_rescale(); group->msw_rescale();

1
src/slic3r/GUI/GUI_ObjectSettings.hpp
View file

@ -39,6 +39,7 @@ class ObjectSettings : public OG_Settings
std::vector <std::shared_ptr<ConfigOptionsGroup>> m_og_settings; std::vector <std::shared_ptr<ConfigOptionsGroup>> m_og_settings;
ScalableBitmap m_bmp_delete; ScalableBitmap m_bmp_delete;
ScalableBitmap m_bmp_delete_focus;
public: public:
ObjectSettings(wxWindow* parent); ObjectSettings(wxWindow* parent);