From 12fe1ac7400db2476d28710f0155d8844fd10728 Mon Sep 17 00:00:00 2001 From: "zhou.xu" Date: Thu, 23 Jan 2025 19:58:31 +0800 Subject: [PATCH] FIX:Click OK should disappear immediately jira: STUDIO-10132 Change-Id: I62547c6888f11afcf76f7a3fd0ad6aa8fe9b0091 --- src/slic3r/GUI/BaseTransparentDPIFrame.cpp | 10 ++++++---- src/slic3r/GUI/SyncAmsInfoDialog.cpp | 5 ++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp index 2b8ea9558..596525d54 100644 --- a/src/slic3r/GUI/BaseTransparentDPIFrame.cpp +++ b/src/slic3r/GUI/BaseTransparentDPIFrame.cpp @@ -199,10 +199,12 @@ void BaseTransparentDPIFrame::on_timer(wxTimerEvent &event) void BaseTransparentDPIFrame::call_start_gradual_disappearance()//for ok or cancel button { - m_enter_window_valid = false; - m_display_stage = 1; - m_refresh_timer->Start(ANIMATION_REFRESH_INTERVAL); - start_gradual_disappearance(); + if (m_enter_window_valid) { + m_enter_window_valid = false; + m_display_stage = 1; + m_refresh_timer->Start(ANIMATION_REFRESH_INTERVAL); + start_gradual_disappearance(); + } } void BaseTransparentDPIFrame::restart() { diff --git a/src/slic3r/GUI/SyncAmsInfoDialog.cpp b/src/slic3r/GUI/SyncAmsInfoDialog.cpp index 413b7c3da..5a56c801c 100644 --- a/src/slic3r/GUI/SyncAmsInfoDialog.cpp +++ b/src/slic3r/GUI/SyncAmsInfoDialog.cpp @@ -4312,8 +4312,7 @@ void SyncNozzleAndAmsDialog::deal_ok() { void SyncNozzleAndAmsDialog::deal_cancel() { - //m_move_to_target_gradual_disappearance = true; - call_start_gradual_disappearance(); + on_hide(); } void SyncNozzleAndAmsDialog::update_info(InputInfo &info) { @@ -4340,7 +4339,7 @@ FinishSyncAmsDialog::FinishSyncAmsDialog(InputInfo &input_info) FinishSyncAmsDialog::~FinishSyncAmsDialog() {} void FinishSyncAmsDialog::deal_ok() { - call_start_gradual_disappearance(); + on_hide(); } void FinishSyncAmsDialog::update_info(InputInfo &info)