diff --git a/src/kiri/init.js b/src/kiri/init.js index aa0acbec..f6fe2a37 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -1245,7 +1245,6 @@ toolTaperTip: $('tool-ttip'), toolMetric: $('tool-metric'), - setNow: $('set-now'), setMenu: $('set-menu'), settings: $('settings'), settingsBody: $('settingsBody'), @@ -1707,11 +1706,6 @@ API.space.reload(); }; - // when profile hover/pop, hide other poppers - $('set-top').onmouseover = () => { - UC.hidePoppers(); - }; - SPACE.addEventHandlers(self, [ 'keyup', keyUpHandler, 'keydown', keyDownHandler, diff --git a/src/kiri/main.js b/src/kiri/main.js index ff62ec5c..21c2c6a9 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -1847,8 +1847,6 @@ settings.cproc[mode] = name; // save named process with the current device settings.devproc[currentDeviceName()] = name; - // update settings hover-pop with current process name - UI.setNow.innerText = named; // allow mode driver to take any necessary actions API.event.emit("settings.load", settings); diff --git a/src/mode/cam/driver.js b/src/mode/cam/driver.js index 6e544773..288210f7 100644 --- a/src/mode/cam/driver.js +++ b/src/mode/cam/driver.js @@ -873,7 +873,9 @@ procDrill = proc.camDrillingOn && proc.camDrillDown && proc.camDrillDownSpeed, procDrillReg = proc.camDrillReg, 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, pocketOnlyOutline = proc.camOutlinePocket, addTabsRough = procRough && proc.camTabsOn && !pocketOnlyRough, diff --git a/web/kiri/index.css b/web/kiri/index.css index 79bb50de..b1d8fcf2 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -902,23 +902,6 @@ th, tr, td, label { border-bottom-left-radius: 0; 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 { color: black; padding: 1px 10px 2px 2px; diff --git a/web/kiri/index.html b/web/kiri/index.html index a4917d5f..64e40761 100644 --- a/web/kiri/index.html +++ b/web/kiri/index.html @@ -332,7 +332,7 @@