mirror of
https://github.com/OrcaSlicer/OrcaSlicer.git
synced 2026-05-22 04:35:17 +00:00
Compare commits
1 Commits
nightly-bu
...
fix/bambu-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
59cf1296ae |
@@ -166,11 +166,11 @@ FilamentGroupPopup::FilamentGroupPopup(wxWindow *parent) : PopupWindow(parent, w
|
||||
|
||||
radio_btns[idx]->Bind(wxEVT_LEFT_DOWN, [this, idx](auto &) { OnRadioBtn(idx);});
|
||||
|
||||
radio_btns[idx]->Bind(wxEVT_ENTER_WINDOW, [this, idx](auto &) { UpdateButtonStatus(idx); });
|
||||
radio_btns[idx]->Bind(wxEVT_ENTER_WINDOW, [this, idx](auto &) { ResetTimer(); UpdateButtonStatus(idx); });
|
||||
radio_btns[idx]->Bind(wxEVT_LEAVE_WINDOW, [this](auto &) { UpdateButtonStatus(); });
|
||||
|
||||
button_labels[idx]->Bind(wxEVT_LEFT_DOWN, [this, idx](auto &) { OnRadioBtn(idx);});
|
||||
button_labels[idx]->Bind(wxEVT_ENTER_WINDOW, [this, idx](auto &) { UpdateButtonStatus(idx); });
|
||||
button_labels[idx]->Bind(wxEVT_ENTER_WINDOW, [this, idx](auto &) { ResetTimer(); UpdateButtonStatus(idx); });
|
||||
button_labels[idx]->Bind(wxEVT_LEAVE_WINDOW, [this](auto &) { UpdateButtonStatus(); });
|
||||
}
|
||||
|
||||
@@ -338,7 +338,13 @@ void FilamentGroupPopup::OnRadioBtn(int idx)
|
||||
}
|
||||
}
|
||||
|
||||
void FilamentGroupPopup::OnTimer(wxTimerEvent &event) { Dismiss(); }
|
||||
void FilamentGroupPopup::OnTimer(wxTimerEvent&)
|
||||
{
|
||||
if (IsMouseInPopup())
|
||||
return;
|
||||
|
||||
Dismiss();
|
||||
}
|
||||
|
||||
void FilamentGroupPopup::Dismiss() {
|
||||
m_active = false;
|
||||
@@ -361,6 +367,12 @@ void FilamentGroupPopup::OnEnterWindow(wxMouseEvent &)
|
||||
ResetTimer();
|
||||
}
|
||||
|
||||
bool FilamentGroupPopup::IsMouseInPopup() const
|
||||
{
|
||||
wxPoint pos = this->ScreenToClient(wxGetMousePosition());
|
||||
return this->GetClientRect().Contains(pos);
|
||||
}
|
||||
|
||||
void FilamentGroupPopup::UpdateButtonStatus(int hover_idx)
|
||||
{
|
||||
for (int i = 0; i < ButtonType::btCount; ++i) {
|
||||
@@ -394,4 +406,4 @@ void FilamentGroupPopup::UpdateButtonStatus(int hover_idx)
|
||||
Fit();
|
||||
}
|
||||
|
||||
}} // namespace Slic3r::GUI
|
||||
}} // namespace Slic3r::GUI
|
||||
|
||||
@@ -36,6 +36,7 @@ private:
|
||||
void OnEnterWindow(wxMouseEvent &);
|
||||
void OnTimer(wxTimerEvent &event);
|
||||
void Dismiss();
|
||||
bool IsMouseInPopup() const;
|
||||
|
||||
void CreateBmps();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user