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

Sketcher: Force cycling back to first labels on OVP if they are not set

Browse Source
This commit is contained in:
tetektoza
2025-06-16 23:36:31 +02:00
parent de966ae5be
commit 9642ce0170
1 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mod/Sketcher/Gui/DrawSketchController.h
View File

@@ -386,10 +386,32 @@ public:
void tryViewValueChanged(int onviewparameterindex, double value)
{
// go only to next label if user has currently pressed enter on current one
int nextindex = onviewparameterindex + 1;
if (onViewParameters[onviewparameterindex]->hasFinishedEditing && isOnViewParameterOfCurrentMode(nextindex)) {
setFocusToOnViewParameter(nextindex);
// go to next label in circular manner if user has currently pressed enter on current one
if (onViewParameters[onviewparameterindex]->hasFinishedEditing) {
// find the first parameter of the current mode that is not locked to start the cycle
auto findNextUnlockedParameter = [this](size_t startIndex) -> int {
for (size_t i = startIndex; i < onViewParameters.size(); i++) {
if (isOnViewParameterOfCurrentMode(i)
&& !onViewParameters[i]->hasFinishedEditing) {
return static_cast<int>(i);
}
}
return -1;
};
// find first unlocked parameter (for cycling back)
int firstOfCurrentMode = findNextUnlockedParameter(0);
// find next unlocked parameter after current one
int nextUnlockedIndex = findNextUnlockedParameter(onviewparameterindex + 1);
// if no next parameter found, cycle back to first of current mode
if (nextUnlockedIndex != -1) {
setFocusToOnViewParameter(nextUnlockedIndex);
}
else if (firstOfCurrentMode != -1) {
setFocusToOnViewParameter(firstOfCurrentMode);
}
}
/* That is not supported with on-view parameters.