FIX: [STUDIO-3239] switch page before select object from notification

Change-Id: I74f4c278d7579c165e9d23425f3e715c7bfa56a6
This commit is contained in:
chunmao.guo 2023-06-15 15:41:32 +08:00 committed by Lane.Wei
parent d8349610f7
commit d79ee0bafe

View file

@ -1881,8 +1881,8 @@ void NotificationManager::push_slicing_error_notification(const std::string &tex
if (iter != objects.end()) { ovs.push_back({*iter, nullptr}); } if (iter != objects.end()) { ovs.push_back({*iter, nullptr}); }
} }
if (!ovs.empty()) { if (!ovs.empty()) {
wxGetApp().obj_list()->select_items(ovs);
wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor); wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor);
wxGetApp().obj_list()->select_items(ovs);
} }
return false; return false;
} : std::function<bool(wxEvtHandler *)>(); } : std::function<bool(wxEvtHandler *)>();
@ -1909,8 +1909,8 @@ void NotificationManager::push_slicing_warning_notification(const std::string& t
auto & objects = wxGetApp().model().objects; auto & objects = wxGetApp().model().objects;
auto iter = std::find_if(objects.begin(), objects.end(), [id](auto o) { return o->id() == id; }); auto iter = std::find_if(objects.begin(), objects.end(), [id](auto o) { return o->id() == id; });
if (iter != objects.end()) { if (iter != objects.end()) {
wxGetApp().obj_list()->select_items({{*iter, nullptr}});
wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor); wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor);
wxGetApp().obj_list()->select_items({{*iter, nullptr}});
} }
return false; return false;
} : std::function<bool(wxEvtHandler *)>(); } : std::function<bool(wxEvtHandler *)>();
@ -2140,8 +2140,8 @@ void NotificationManager::push_slicing_serious_warning_notification(const std::s
if (iter != objects.end()) { ovs.push_back({*iter, nullptr}); } if (iter != objects.end()) { ovs.push_back({*iter, nullptr}); }
} }
if (!ovs.empty()) { if (!ovs.empty()) {
wxGetApp().obj_list()->select_items(ovs);
wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor); wxGetApp().mainframe->select_tab(MainFrame::tp3DEditor);
wxGetApp().obj_list()->select_items(ovs);
} }
return false; return false;
} : } :