kindred/create
1
1
Fork 0
Code Issues 53 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Return NotImplemented on PythonFeature::setEdit if the setEdit is implemented and returns True for one of the standard, not Default, edit modes

Browse Source
This commit is contained in:
markus
2018-10-02 16:26:50 -07:00
committed by wmayer
parent 5b85233a58
commit 868baa6dd2
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Gui/ViewProviderPythonFeature.cpp
View File

@@ -433,6 +433,15 @@ ViewProviderPythonFeatureImp::setEdit(int ModNum)
args.setItem(0, Py::Int(ModNum));
Py::Boolean ok(method.apply(args));
bool value = (bool)ok;
if (value &&
(ViewProvider::EditMode::Transform == ModNum ||
ViewProvider::EditMode::Cutting == ModNum ||
ViewProvider::EditMode::Color == ModNum)) {
// returning NotImplemented for the system edit modes if the receiver returns True
// so python features can implement their own edit dialog and yet still allow for
// the transformation tool / color assignment to work
return NotImplemented;
}
return value ? Accepted : Rejected;
}
else {
@@ -442,6 +451,15 @@ ViewProviderPythonFeatureImp::setEdit(int ModNum)
args.setItem(1, Py::Int(ModNum));
Py::Boolean ok(method.apply(args));
bool value = (bool)ok;
if (value &&
(ViewProvider::EditMode::Transform == ModNum ||
ViewProvider::EditMode::Cutting == ModNum ||
ViewProvider::EditMode::Color == ModNum)) {
// returning NotImplemented for the system edit modes if the receiver returns True
// so python features can implement their own edit dialog and yet still allow for
// the transformation tool / color assignment to work
return NotImplemented;
}
return value ? Accepted : Rejected;
}
}