mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX: do not hover if slice option pop up 

jira:STUDIO-10275

Signed-off-by: xun.zhang <xun.zhang@bambulab.com>
Change-Id: Ia599ce164d6f8a178b7154d20b49014f67bdbde9
This commit is contained in:
xun.zhang 2025-02-11 19:51:22 +08:00 committed by lane.wei
parent 038df3180a
commit 3133b2a52f
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/slic3r/GUI/MainFrame.cpp
View File

@ -1622,16 +1622,19 @@ wxBoxSizer* MainFrame::create_side_tools()
m_filament_group_popup->tryPopup(m_plater, curr_plate, m_slice_select == eSliceAll);
};
// this pannel is used to trigger hover when button is disabled
slice_panel->Bind(wxEVT_ENTER_WINDOW, [this,try_hover_pop_up](auto& event) {
try_hover_pop_up();
if(!m_slice_option_pop_up || !m_slice_option_pop_up->IsShown())
try_hover_pop_up();
});
slice_panel->Bind(wxEVT_LEAVE_WINDOW, [this](auto& event) {
m_filament_group_popup->tryClose();
});
m_slice_btn->Bind(wxEVT_ENTER_WINDOW, [this,try_hover_pop_up](auto& event) {
try_hover_pop_up();
m_slice_btn->Bind(wxEVT_ENTER_WINDOW, [this, try_hover_pop_up](auto& event) {
if (!m_slice_option_pop_up || !m_slice_option_pop_up->IsShown())
try_hover_pop_up();
});
m_slice_btn->Bind(wxEVT_LEAVE_WINDOW, [this](auto& event) {
@ -1728,32 +1731,36 @@ wxBoxSizer* MainFrame::create_side_tools()
m_slice_option_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent& event)
{
SidePopup* p = new SidePopup(this);
SideButton* slice_all_btn = new SideButton(p, _L("Slice all"), "");
if(m_slice_option_pop_up)
delete m_slice_option_pop_up;
m_slice_option_pop_up = new SidePopup(this);
SideButton* slice_all_btn = new SideButton(m_slice_option_pop_up, _L("Slice all"), "");
slice_all_btn->SetCornerRadius(0);
SideButton* slice_plate_btn = new SideButton(p, _L("Slice plate"), "");
SideButton* slice_plate_btn = new SideButton(m_slice_option_pop_up, _L("Slice plate"), "");
slice_plate_btn->SetCornerRadius(0);
slice_all_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) {
slice_all_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) {
m_slice_btn->SetLabel(_L("Slice all"));
m_slice_select = eSliceAll;
m_slice_enable = get_enable_slice_status();
m_slice_btn->Enable(m_slice_enable);
this->Layout();
p->Dismiss();
if(m_slice_option_pop_up)
m_slice_option_pop_up->Dismiss();
});
slice_plate_btn->Bind(wxEVT_BUTTON, [this, p](wxCommandEvent&) {
slice_plate_btn->Bind(wxEVT_BUTTON, [this](wxCommandEvent&) {
m_slice_btn->SetLabel(_L("Slice plate"));
m_slice_select = eSlicePlate;
m_slice_enable = get_enable_slice_status();
m_slice_btn->Enable(m_slice_enable);
this->Layout();
p->Dismiss();
if(m_slice_option_pop_up)
m_slice_option_pop_up->Dismiss();
});
p->append_button(slice_all_btn);
p->append_button(slice_plate_btn);
p->Popup(m_slice_btn);
m_slice_option_pop_up->append_button(slice_all_btn);
m_slice_option_pop_up->append_button(slice_plate_btn);
m_slice_option_pop_up->Popup(m_slice_btn);
}
);

2
src/slic3r/GUI/MainFrame.hpp
View File

@ -395,6 +395,8 @@ public:
SideButton* m_print_btn{ nullptr };
SideButton* m_print_option_btn{ nullptr };
SidePopup* m_slice_option_pop_up{ nullptr };
FilamentGroupPopup* m_filament_group_popup{ nullptr };
mutable bool m_slice_enable{ true };
mutable bool m_print_enable{ true };