juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-05-17 02:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX:Only one of the two dialogs is displayed

Browse Source 
jira: STUDIO-10065
Change-Id: I7763de83697ea9645808757b9396acd34cd12cca
(cherry picked from commit eab6384c6cb50428689bae724ee1d16217eab28d)
This commit is contained in:
zhou.xu
2025-01-20 17:03:14 +08:00
committed by Noisyfox
parent a8d2a0e589
commit ecb94e119c
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/slic3r/GUI/Plater.cpp
View File

@@ -2903,7 +2903,10 @@ void Sidebar::sync_ams_list(bool is_from_big_sync_btn)
temp_fsa_info.dialog_pos.x = same_dialog_pos_x;
temp_fsa_info.dialog_pos.y = small_btn_pt.y;
if (m_fna_dialog) {
m_fna_dialog.reset();
if (m_sna_dialog) {
m_sna_dialog->on_hide();
}
m_fna_dialog.reset();
}
m_fna_dialog = std::make_shared<FinishSyncAmsDialog>(this, temp_fsa_info);
m_fna_dialog->Show();
@@ -3022,7 +3025,12 @@ void Sidebar::pop_sync_nozzle_and_ams_ialog() {
int same_dialog_pos_x = get_sidebar_pos_right_x() + FromDIP(5);
temp_na_info.dialog_pos.x = same_dialog_pos_x;
temp_na_info.dialog_pos.y += FromDIP(2);
if (m_sna_dialog) { m_sna_dialog.reset(); }
if (m_sna_dialog) {
if (m_fna_dialog) {
m_fna_dialog->on_hide();
}
m_sna_dialog.reset();
}
m_sna_dialog = std::make_shared<SyncNozzleAndAmsDialog>(this, temp_na_info);
m_sna_dialog->Show();
m_sna_dialog->Raise();