vmario/Doodle3D-Core
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Core.git synced 2024-12-22 11:03:48 +01:00
Code Issues Projects Releases Wiki Activity

place union and intersect in context menu

Browse Source
This commit is contained in:
casperlamboo 2017-12-06 13:57:28 +01:00
parent b8cefc2310
commit f759b2e468
3 changed files with 5 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/constants/contextTools.js
View File

@ -6,7 +6,8 @@ export const BRUSH_SIZE = 'brush-size-tool';
export const FILL_TOGGLE = 'fill-toggle-tool'; export const FILL_TOGGLE = 'fill-toggle-tool';
export const HOLE_TOGGLE = 'hole-toggle-tool'; export const HOLE_TOGGLE = 'hole-toggle-tool';
export const ALIGN = 'align-tool'; export const ALIGN = 'align-tool';
export const ADVANCED = 'advanced-tool'; export const UNION = 'union-tool';
export const INTERSECT = 'intersect-tool';
export const LIGHT_BLUE = 'color-light-blue'; export const LIGHT_BLUE = 'color-light-blue';
export const LIGHT_GREEN = 'color-light-green'; export const LIGHT_GREEN = 'color-light-green';
@ -81,11 +82,3 @@ export const ALIGN_TOOLS = [
ALIGN_VERTICAL, ALIGN_VERTICAL,
ALIGN_BOTTOM ALIGN_BOTTOM
]; ];
export const UNION = 'union-tool';
export const INTERSECT = 'intersect-tool';
export const ADVANCED_TOOLS = [
UNION,
INTERSECT
];

9
src/constants/menu.js
View File

@ -97,12 +97,9 @@ const context = {
selected: contextTools.ALIGN_HORIZONTAL, selected: contextTools.ALIGN_HORIZONTAL,
children: contextTools.ALIGN_TOOLS.map(value => ({ value })), children: contextTools.ALIGN_TOOLS.map(value => ({ value })),
...selectorBehavior ...selectorBehavior
}, { },
value: contextTools.ADVANCED, { value: contextTools.UNION },
selected: contextTools.UNION, { value: contextTools.INTERSECT }
children: contextTools.ADVANCED_TOOLS.map(value => ({ value })),
...selectorBehavior
}
] ]
}; };

8
styles/styles.css
View File

@ -131,19 +131,11 @@
background-image: url('../img/contextmenu/btnGroup.png'); background-image: url('../img/contextmenu/btnGroup.png');
background-size: 33px auto; background-size: 33px auto;
height: 41px; height: 41px;
width: 30px;
} }
#context #intersect-tool { #context #intersect-tool {
background-image: url('../img/contextmenu/btnCutOut.png'); background-image: url('../img/contextmenu/btnCutOut.png');
background-size: 33px auto; background-size: 33px auto;
height: 41px; height: 41px;
width: 30px;
}
#union-tool-menu, #intersect-tool-menu {
background-image: url('../img/contextmenu/btnMore.png');
background-size: 33px auto;
height: 41px;
width: 30px;
} }
#brush-size-small, #brush-size-small-menu, #brush-size-small, #brush-size-small-menu,
#eraser-size-small, #eraser-size-small-menu { #eraser-size-small, #eraser-size-small-menu {