Use zOrder for selections within the same group

pull/789/head
phkahler 2020-10-30 13:21:26 -04:00
parent d973405c8c
commit 6ff8db93e8
1 changed files with 2 additions and 2 deletions

View File

@ -352,7 +352,7 @@ GraphicsWindow::Selection GraphicsWindow::ChooseFromHoverToSelect() {
Group *g = SK.GetGroup(hg); Group *g = SK.GetGroup(hg);
if(g->order > activeGroup->order) continue; if(g->order > activeGroup->order) continue;
if(bestOrder != -1 && (bestOrder >= g->order || bestZIndex > hov.zIndex)) continue; if(bestOrder != -1 && (bestOrder > g->order || bestZIndex > hov.zIndex)) continue;
bestOrder = g->order; bestOrder = g->order;
bestZIndex = hov.zIndex; bestZIndex = hov.zIndex;
sel = hov.selection; sel = hov.selection;
@ -382,7 +382,7 @@ GraphicsWindow::Selection GraphicsWindow::ChooseFromHoverToDrag() {
Group *g = SK.GetGroup(hg); Group *g = SK.GetGroup(hg);
if(g->order > activeGroup->order) continue; if(g->order > activeGroup->order) continue;
if(bestOrder != -1 && (bestOrder >= g->order || bestZIndex > hov.zIndex)) continue; if(bestOrder != -1 && (bestOrder > g->order || bestZIndex > hov.zIndex)) continue;
bestOrder = g->order; bestOrder = g->order;
bestZIndex = hov.zIndex; bestZIndex = hov.zIndex;
sel = hov.selection; sel = hov.selection;