fix slice step down when not rough or outline. remove settings name hover
This commit is contained in:
parent
532fe5cc8b
commit
b08c4b297f
5 changed files with 4 additions and 27 deletions
|
|
@ -1245,7 +1245,6 @@
|
||||||
toolTaperTip: $('tool-ttip'),
|
toolTaperTip: $('tool-ttip'),
|
||||||
toolMetric: $('tool-metric'),
|
toolMetric: $('tool-metric'),
|
||||||
|
|
||||||
setNow: $('set-now'),
|
|
||||||
setMenu: $('set-menu'),
|
setMenu: $('set-menu'),
|
||||||
settings: $('settings'),
|
settings: $('settings'),
|
||||||
settingsBody: $('settingsBody'),
|
settingsBody: $('settingsBody'),
|
||||||
|
|
@ -1707,11 +1706,6 @@
|
||||||
API.space.reload();
|
API.space.reload();
|
||||||
};
|
};
|
||||||
|
|
||||||
// when profile hover/pop, hide other poppers
|
|
||||||
$('set-top').onmouseover = () => {
|
|
||||||
UC.hidePoppers();
|
|
||||||
};
|
|
||||||
|
|
||||||
SPACE.addEventHandlers(self, [
|
SPACE.addEventHandlers(self, [
|
||||||
'keyup', keyUpHandler,
|
'keyup', keyUpHandler,
|
||||||
'keydown', keyDownHandler,
|
'keydown', keyDownHandler,
|
||||||
|
|
|
||||||
|
|
@ -1847,8 +1847,6 @@
|
||||||
settings.cproc[mode] = name;
|
settings.cproc[mode] = name;
|
||||||
// save named process with the current device
|
// save named process with the current device
|
||||||
settings.devproc[currentDeviceName()] = name;
|
settings.devproc[currentDeviceName()] = name;
|
||||||
// update settings hover-pop with current process name
|
|
||||||
UI.setNow.innerText = named;
|
|
||||||
|
|
||||||
// allow mode driver to take any necessary actions
|
// allow mode driver to take any necessary actions
|
||||||
API.event.emit("settings.load", settings);
|
API.event.emit("settings.load", settings);
|
||||||
|
|
|
||||||
|
|
@ -873,7 +873,9 @@
|
||||||
procDrill = proc.camDrillingOn && proc.camDrillDown && proc.camDrillDownSpeed,
|
procDrill = proc.camDrillingOn && proc.camDrillDown && proc.camDrillDownSpeed,
|
||||||
procDrillReg = proc.camDrillReg,
|
procDrillReg = proc.camDrillReg,
|
||||||
procTrace = proc.camTraceOn,
|
procTrace = proc.camTraceOn,
|
||||||
sliceDepth = Math.max(0.1, Math.min(proc.camRoughDown, proc.camOutlineDown) / 3 * units),
|
roughDown = procRough ? proc.camRoughDown : Infinity,
|
||||||
|
outlineDown = procOutline ? proc.camOutlineDown : Infinity,
|
||||||
|
sliceDepth = Math.max(0.1, Math.min(roughDown, outlineDown) / 3 * units),
|
||||||
pocketOnlyRough = proc.camRoughPocket,
|
pocketOnlyRough = proc.camRoughPocket,
|
||||||
pocketOnlyOutline = proc.camOutlinePocket,
|
pocketOnlyOutline = proc.camOutlinePocket,
|
||||||
addTabsRough = procRough && proc.camTabsOn && !pocketOnlyRough,
|
addTabsRough = procRough && proc.camTabsOn && !pocketOnlyRough,
|
||||||
|
|
|
||||||
|
|
@ -902,23 +902,6 @@ th, tr, td, label {
|
||||||
border-bottom-left-radius: 0;
|
border-bottom-left-radius: 0;
|
||||||
background-color: var(--bg-gray);
|
background-color: var(--bg-gray);
|
||||||
}
|
}
|
||||||
#set-top:hover #set-now {
|
|
||||||
display: flex;
|
|
||||||
}
|
|
||||||
#set-now {
|
|
||||||
display: none;
|
|
||||||
position: absolute;
|
|
||||||
transform: translateY(-50%);
|
|
||||||
top: 50%;
|
|
||||||
right: 100%;
|
|
||||||
padding: 5px;
|
|
||||||
margin-right: 5px;
|
|
||||||
border: 1px solid #ccc;
|
|
||||||
border-radius: 4px;
|
|
||||||
background-color: white;
|
|
||||||
white-space: nowrap;
|
|
||||||
z-index: 10;
|
|
||||||
}
|
|
||||||
#set-end {
|
#set-end {
|
||||||
color: black;
|
color: black;
|
||||||
padding: 1px 10px 2px 2px;
|
padding: 1px 10px 2px 2px;
|
||||||
|
|
|
||||||
|
|
@ -332,7 +332,7 @@
|
||||||
</div>
|
</div>
|
||||||
<div id="mid-rcol" class="f-col j-center noshow">
|
<div id="mid-rcol" class="f-col j-center noshow">
|
||||||
<div id="set-menu" class="f-col">
|
<div id="set-menu" class="f-col">
|
||||||
<div id="set-top" class="set-group"><a>settings</a><div id="set-now"></div></div>
|
<div id="set-top" class="set-group"><a>settings</a></div>
|
||||||
<div id="settings" class="f-col"></div>
|
<div id="settings" class="f-col"></div>
|
||||||
<div id="set-end" class="set-group"></div>
|
<div id="set-end" class="set-group"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue