bump version to 2.4.0-alpha

src/slic3r/GUI/FilamentGroupPopup.cpp

@@ -338,15 +338,7 @@ void FilamentGroupPopup::OnRadioBtn(int idx)
     }
 }
 
-void FilamentGroupPopup::OnTimer(wxTimerEvent&)
+void FilamentGroupPopup::OnTimer(wxTimerEvent &event) { Dismiss(); }
-{
-    if (IsMouseInPopup()) {
-        StartTimer();
-        return;
-    }
-
-    Dismiss();
-}
 
 void FilamentGroupPopup::Dismiss() {
     m_active = false;
@@ -356,22 +348,19 @@ void FilamentGroupPopup::Dismiss() {
 
 void FilamentGroupPopup::OnLeaveWindow(wxMouseEvent &)
 {
-    if (this->GetScreenRect().Contains(wxGetMousePosition())) return;
+    wxPoint pos = this->ScreenToClient(wxGetMousePosition());
+    if (this->GetClientRect().Contains(pos)) return;
     StartTimer();
 }
 
 void FilamentGroupPopup::OnEnterWindow(wxMouseEvent &)
 {
     // Ignore spurious ENTER synthesized by PopupWindow::OnMouseEvent2 on macOS.
-    if (!this->GetScreenRect().Contains(wxGetMousePosition())) return;
+    wxPoint pos = this->ScreenToClient(wxGetMousePosition());
+    if (!this->GetClientRect().Contains(pos)) return;
     ResetTimer();
 }
 
-bool FilamentGroupPopup::IsMouseInPopup() const
-{
-    return this->GetScreenRect().Contains(wxGetMousePosition());
-}
-
 void FilamentGroupPopup::UpdateButtonStatus(int hover_idx)
 {
     for (int i = 0; i < ButtonType::btCount; ++i) {

src/slic3r/GUI/FilamentGroupPopup.hpp

@@ -36,7 +36,6 @@ private:
     void OnEnterWindow(wxMouseEvent &);
     void OnTimer(wxTimerEvent &event);
     void Dismiss();
-    bool IsMouseInPopup() const;
 
     void CreateBmps();
 

version.inc

@@ -7,7 +7,7 @@ set(SLIC3R_APP_KEY "OrcaSlicer")
 if(NOT DEFINED BBL_INTERNAL_TESTING)
 set(BBL_INTERNAL_TESTING "0")
 endif()
-set(SoftFever_VERSION "2.4.0-dev")
+set(SoftFever_VERSION "2.4.0-alpha")
 string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)"
        SoftFever_VERSION_MATCH ${SoftFever_VERSION})
 set(ORCA_VERSION_MAJOR ${CMAKE_MATCH_1})