FIX: object list plate name edit
Change-Id: I61d3dcd7d9598d759a3a0b44cc77d2af2adca25a Jira: STUDIO-4937
This commit is contained in:
parent
727db50593
commit
ec18a18d10
|
@ -977,8 +977,8 @@ void ObjectList::update_name_in_model(const wxDataViewItem& item) const
|
||||||
auto plate = wxGetApp().plater()->get_partplate_list().get_plate(plate_idx);
|
auto plate = wxGetApp().plater()->get_partplate_list().get_plate(plate_idx);
|
||||||
if (plate->get_plate_name() != name) {
|
if (plate->get_plate_name() != name) {
|
||||||
plate->set_plate_name(name);
|
plate->set_plate_name(name);
|
||||||
m_objects_model->SetCurSelectedPlateFullName(plate_idx, name);
|
|
||||||
}
|
}
|
||||||
|
m_objects_model->SetCurSelectedPlateFullName(plate_idx, name);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -5665,6 +5665,17 @@ void ObjectList::OnEditingDone(wxDataViewEvent &event)
|
||||||
if (event.GetColumn() != colName)
|
if (event.GetColumn() != colName)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
if (event.IsEditCancelled()) {
|
||||||
|
if (m_objects_model->GetItemType(event.GetItem()) & itPlate) {
|
||||||
|
int plate_idx = -1;
|
||||||
|
m_objects_model->GetItemType(event.GetItem(), plate_idx);
|
||||||
|
if (plate_idx >= 0) {
|
||||||
|
auto plate = wxGetApp().plater()->get_partplate_list().get_plate(plate_idx);
|
||||||
|
m_objects_model->SetCurSelectedPlateFullName(plate_idx, plate->get_plate_name());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
const auto renderer = dynamic_cast<BitmapTextRenderer*>(GetColumn(colName)->GetRenderer());
|
const auto renderer = dynamic_cast<BitmapTextRenderer*>(GetColumn(colName)->GetRenderer());
|
||||||
#if __WXOSX__
|
#if __WXOSX__
|
||||||
SetAcceleratorTable(m_accel);
|
SetAcceleratorTable(m_accel);
|
||||||
|
|
Loading…
Reference in New Issue