add settings name hover/pop

This commit is contained in:
Stewart Allen 2020-06-12 23:06:37 -04:00
commit 777f118f0f
5 changed files with 39 additions and 8 deletions

View file

@ -158,8 +158,6 @@
if (KIRI.work.isSlicing()) KIRI.work.restart(); if (KIRI.work.isSlicing()) KIRI.work.restart();
// kill any poppers in compact mode // kill any poppers in compact mode
UC.hidePoppers(); UC.hidePoppers();
// hide layers menu
// UI.layers.style.display = 'none';
break; break;
} }
return false; return false;
@ -1165,6 +1163,7 @@
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'),
@ -1585,6 +1584,10 @@
API.space.reload(); API.space.reload();
}; };
$('set-top').onmouseover = () => {
UC.hidePoppers();
};
SPACE.addEventHandlers(self, [ SPACE.addEventHandlers(self, [
'keyup', keyUpHandler, 'keyup', keyUpHandler,
'keydown', keyDownHandler, 'keydown', keyDownHandler,

View file

@ -1725,22 +1725,32 @@
let mode = getMode(), let mode = getMode(),
name = e ? e.target.getAttribute("load") : named || settings.cproc[mode], name = e ? e.target.getAttribute("load") : named || settings.cproc[mode],
load = settings.sproc[mode][name]; load = settings.sproc[mode][name];
if (!load) return; if (!load) return;
// clone loaded process into settings
settings.process = clone(load); settings.process = clone(load);
// update process name
settings.process.processName = name; settings.process.processName = name;
// set currenet process name for this mode
settings.cproc[mode] = name; settings.cproc[mode] = name;
// save named process with the current device
// associate 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
API.event.emit("settings.load", settings);
// FDM process settings overridden by device // FDM process settings overridden by device
if (mode == "FDM") { // if (mode == "FDM") {
settings.process.outputOriginCenter = (settings.device.originCenter || false); // settings.process.outputOriginCenter = (settings.device.originCenter || false);
} // }
// update UI fields to reflect current settings
updateFields(); updateFields();
API.conf.update(); API.conf.update();
if (e) triggerSettingsEvent(); if (e) triggerSettingsEvent();
} }

View file

@ -45,6 +45,9 @@
} }
function init(kiri, api) { function init(kiri, api) {
api.event.on("settings.load", (settings) => {
settings.process.outputOriginCenter = (settings.device.originCenter || false);
});
api.event.on("settings.saved", (settings) => { api.event.on("settings.saved", (settings) => {
let proc = settings.process; let proc = settings.process;
api.ui.fdmSupport.marker.style.display = proc.sliceSupportEnable ? 'flex' : 'none'; api.ui.fdmSupport.marker.style.display = proc.sliceSupportEnable ? 'flex' : 'none';

View file

@ -831,6 +831,21 @@ th, tr, td {
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;
top: -1px;
right: 100%;
padding: 5px;
margin-right: 5px;
border: 1px solid #ccc;
border-radius: 3px;
background-color: white;
z-index: 10;
}
#set-end { #set-end {
color: black; color: black;
padding: 1px 10px 2px 2px; padding: 1px 10px 2px 2px;

View file

@ -303,7 +303,7 @@
</div> </div>
<div id="mid-rcol" class="col j-center noshow"> <div id="mid-rcol" class="col j-center noshow">
<div id="set-menu" class="col"> <div id="set-menu" class="col">
<div id="set-top" class="set-group"><a>settings</a></div> <div id="set-top" class="set-group"><a>settings</a><div id="set-now"></div></div>
<div id="settings" class="col"></div> <div id="settings" class="col"></div>
<div id="set-end" class="set-group"></div> <div id="set-end" class="set-group"></div>
</div> </div>