FIX:Click OK should disappear immediately
jira: STUDIO-10132 Change-Id: I62547c6888f11afcf76f7a3fd0ad6aa8fe9b0091
This commit is contained in:
parent
f5133d9d43
commit
12fe1ac740
|
@ -199,10 +199,12 @@ void BaseTransparentDPIFrame::on_timer(wxTimerEvent &event)
|
||||||
|
|
||||||
void BaseTransparentDPIFrame::call_start_gradual_disappearance()//for ok or cancel button
|
void BaseTransparentDPIFrame::call_start_gradual_disappearance()//for ok or cancel button
|
||||||
{
|
{
|
||||||
m_enter_window_valid = false;
|
if (m_enter_window_valid) {
|
||||||
m_display_stage = 1;
|
m_enter_window_valid = false;
|
||||||
m_refresh_timer->Start(ANIMATION_REFRESH_INTERVAL);
|
m_display_stage = 1;
|
||||||
start_gradual_disappearance();
|
m_refresh_timer->Start(ANIMATION_REFRESH_INTERVAL);
|
||||||
|
start_gradual_disappearance();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void BaseTransparentDPIFrame::restart() {
|
void BaseTransparentDPIFrame::restart() {
|
||||||
|
|
|
@ -4312,8 +4312,7 @@ void SyncNozzleAndAmsDialog::deal_ok() {
|
||||||
|
|
||||||
void SyncNozzleAndAmsDialog::deal_cancel()
|
void SyncNozzleAndAmsDialog::deal_cancel()
|
||||||
{
|
{
|
||||||
//m_move_to_target_gradual_disappearance = true;
|
on_hide();
|
||||||
call_start_gradual_disappearance();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void SyncNozzleAndAmsDialog::update_info(InputInfo &info) {
|
void SyncNozzleAndAmsDialog::update_info(InputInfo &info) {
|
||||||
|
@ -4340,7 +4339,7 @@ FinishSyncAmsDialog::FinishSyncAmsDialog(InputInfo &input_info)
|
||||||
FinishSyncAmsDialog::~FinishSyncAmsDialog() {}
|
FinishSyncAmsDialog::~FinishSyncAmsDialog() {}
|
||||||
|
|
||||||
void FinishSyncAmsDialog::deal_ok() {
|
void FinishSyncAmsDialog::deal_ok() {
|
||||||
call_start_gradual_disappearance();
|
on_hide();
|
||||||
}
|
}
|
||||||
|
|
||||||
void FinishSyncAmsDialog::update_info(InputInfo &info)
|
void FinishSyncAmsDialog::update_info(InputInfo &info)
|
||||||
|
|
Loading…
Reference in New Issue