caiyu/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add new group after active group, not after all groups.

Browse Source
This commit is contained in:
whitequark 2016-02-17 10:31:15 +00:00
parent c9648805ea
commit 27d0dedbd1
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/group.cpp
View File

@ -56,9 +56,6 @@ void Group::MenuGroup(int id) {
g.color = RGBi(100, 100, 100); g.color = RGBi(100, 100, 100);
g.scale = 1; g.scale = 1;
Group *gl = SK.GetGroup(SK.groupOrder.elem[SK.groupOrder.n - 1]);
g.order = gl->order + 1;
if(id >= RECENT_IMPORT && id < (RECENT_IMPORT + MAX_RECENT)) { if(id >= RECENT_IMPORT && id < (RECENT_IMPORT + MAX_RECENT)) {
g.impFile = RecentFile[id-RECENT_IMPORT]; g.impFile = RecentFile[id-RECENT_IMPORT];
id = GraphicsWindow::MNU_GROUP_IMPORT; id = GraphicsWindow::MNU_GROUP_IMPORT;
@ -228,6 +225,17 @@ void Group::MenuGroup(int id) {
SS.GW.ClearSelection(); SS.GW.ClearSelection();
SS.UndoRemember(); SS.UndoRemember();
bool afterActive = false;
for(int i = 0; i < SK.groupOrder.n; i++) {
Group *gi = SK.GetGroup(SK.groupOrder.elem[i]);
if(afterActive)
gi->order += 1;
if(gi->h.v == SS.GW.activeGroup.v) {
g.order = gi->order + 1;
afterActive = true;
}
}
SK.group.AddAndAssignId(&g); SK.group.AddAndAssignId(&g);
Group *gg = SK.GetGroup(g.h); Group *gg = SK.GetGroup(g.h);