Skip to content

Commit f759b2e

Browse files
committed
place union and intersect in context menu
1 parent b8cefc2 commit f759b2e

File tree

3 files changed

+5
-23
lines changed

3 files changed

+5
-23
lines changed

src/constants/contextTools.js

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ export const BRUSH_SIZE = 'brush-size-tool';
66
export const FILL_TOGGLE = 'fill-toggle-tool';
77
export const HOLE_TOGGLE = 'hole-toggle-tool';
88
export const ALIGN = 'align-tool';
9-
export const ADVANCED = 'advanced-tool';
9+
export const UNION = 'union-tool';
10+
export const INTERSECT = 'intersect-tool';
1011

1112
export const LIGHT_BLUE = 'color-light-blue';
1213
export const LIGHT_GREEN = 'color-light-green';
@@ -81,11 +82,3 @@ export const ALIGN_TOOLS = [
8182
ALIGN_VERTICAL,
8283
ALIGN_BOTTOM
8384
];
84-
85-
export const UNION = 'union-tool';
86-
export const INTERSECT = 'intersect-tool';
87-
88-
export const ADVANCED_TOOLS = [
89-
UNION,
90-
INTERSECT
91-
];

src/constants/menu.js

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,9 @@ const context = {
9797
selected: contextTools.ALIGN_HORIZONTAL,
9898
children: contextTools.ALIGN_TOOLS.map(value => ({ value })),
9999
...selectorBehavior
100-
}, {
101-
value: contextTools.ADVANCED,
102-
selected: contextTools.UNION,
103-
children: contextTools.ADVANCED_TOOLS.map(value => ({ value })),
104-
...selectorBehavior
105-
}
100+
},
101+
{ value: contextTools.UNION },
102+
{ value: contextTools.INTERSECT }
106103
]
107104
};
108105

styles/styles.css

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -131,19 +131,11 @@
131131
background-image: url('../img/contextmenu/btnGroup.png');
132132
background-size: 33px auto;
133133
height: 41px;
134-
width: 30px;
135134
}
136135
#context #intersect-tool {
137136
background-image: url('../img/contextmenu/btnCutOut.png');
138137
background-size: 33px auto;
139138
height: 41px;
140-
width: 30px;
141-
}
142-
#union-tool-menu, #intersect-tool-menu {
143-
background-image: url('../img/contextmenu/btnMore.png');
144-
background-size: 33px auto;
145-
height: 41px;
146-
width: 30px;
147139
}
148140
#brush-size-small, #brush-size-small-menu,
149141
#eraser-size-small, #eraser-size-small-menu {

0 commit comments

Comments
 (0)