start new settings group l&f
This commit is contained in:
parent
69097ab823
commit
7c28fb1f2d
4 changed files with 40 additions and 39 deletions
|
|
@ -1841,7 +1841,7 @@ gapp.register("kiri.init", [], (root, exports) => {
|
|||
|
||||
prefadd: uc.checkpoint($('prefs-add')),
|
||||
|
||||
process: uc.newGroup(LANG.sl_menu, $('settings'), {modes:FDM_LZR}),
|
||||
process: uc.newGroup(LANG.sl_menu, $('fdm-layers'), {modes:FDM_LZR}),
|
||||
sliceHeight: uc.newInput(LANG.sl_lahi_s, {title:LANG.sl_lahi_l, convert:uc.toFloat, modes:FDM}),
|
||||
sliceMinHeight: uc.newInput(LANG.ad_minl_s, {title:LANG.ad_minl_l, bound:uc.bound(0,3.0), convert:uc.toFloat, modes:FDM, show: () => ui.sliceAdaptive.checked}),
|
||||
fdmSep: uc.newBlank({class:"pop-sep", modes:FDM}),
|
||||
|
|
@ -1855,6 +1855,7 @@ gapp.register("kiri.init", [], (root, exports) => {
|
|||
sliceDetectThin: uc.newSelect(LANG.ad_thin_s, {title: LANG.ad_thin_l, action: thinWallSave, modes:FDM}, "thin"),
|
||||
sliceAdaptive: uc.newBoolean(LANG.ad_adap_s, onBooleanClick, {title: LANG.ad_adap_l, modes:FDM, trigger: true}),
|
||||
|
||||
laserMode: uc.newGroup(LANG.sl_menu, $('settings'), {modes:LASER}),
|
||||
laserOffset: uc.newInput(LANG.ls_offs_s, {title:LANG.ls_offs_l, convert:uc.toFloat, modes:LASER}),
|
||||
laserSliceHeight: uc.newInput(LANG.ls_lahi_s, {title:LANG.ls_lahi_l, convert:uc.toFloat, modes:LASER, trigger: true}),
|
||||
laserSliceHeightMin: uc.newInput(LANG.ls_lahm_s, {title:LANG.ls_lahm_l, convert:uc.toFloat, modes:LASER, show:() => { return ui.laserSliceHeight.value == 0 }}),
|
||||
|
|
|
|||
|
|
@ -298,7 +298,6 @@ gapp.register("kiri.ui", [], (root, exports) => {
|
|||
lastGroup.key = dbkey;
|
||||
groupName = group;
|
||||
groupShow[group] = state[dbkey] !== 'false';
|
||||
// groupShow[group] = popper ? state[dbkey] === 'true' : state[dbkey] !== 'false';
|
||||
row.onclick = function(ev) {
|
||||
if (ev.target !== link && ev.target !== row) {
|
||||
return;
|
||||
|
|
@ -306,41 +305,6 @@ gapp.register("kiri.ui", [], (root, exports) => {
|
|||
console.log({ toggleGroup: group, dbkey });
|
||||
toggleGroup(group, dbkey);
|
||||
};
|
||||
// if (popper) {
|
||||
// let saveclick = row.onclick;
|
||||
// row.onclick = function(ev) {
|
||||
// let showing = groupShow[group];
|
||||
// if (saveclick && showing) {
|
||||
// saveclick(ev);
|
||||
// } else {
|
||||
// row.onmouseenter(ev, true);
|
||||
// }
|
||||
// };
|
||||
// row.onmouseenter = function(ev, click) {
|
||||
// let showing = groupShow[group];
|
||||
// if (!(letHoverPop || click || showing)) {
|
||||
// return;
|
||||
// }
|
||||
// if (ev.target !== link && ev.target !== row) {
|
||||
// return;
|
||||
// }
|
||||
// clearTimeout(exitimer);
|
||||
// showGroup(group);
|
||||
// };
|
||||
// row.onmouseleave = function(ev) {
|
||||
// if (groupSticky) {
|
||||
// return;
|
||||
// }
|
||||
// if (ev.target !== link && ev.target !== row) {
|
||||
// return;
|
||||
// }
|
||||
// clearTimeout(exitimer);
|
||||
// exitimer = setTimeout(showGroup, 1000);
|
||||
// };
|
||||
// addTo._group = group;
|
||||
// addModeControls(addTo, opt);
|
||||
// lastGroup.push(addTo);
|
||||
// }
|
||||
|
||||
return row;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -529,6 +529,7 @@ th, tr, td, label {
|
|||
#mode-info label {
|
||||
font-size: smaller;
|
||||
font-weight: bold;
|
||||
align-self: center;
|
||||
margin: 2px 0 2px 5px;
|
||||
padding: 2px 5px 2px 5px;
|
||||
color: var(--fg-gray);
|
||||
|
|
@ -1850,6 +1851,39 @@ th, tr, td, label {
|
|||
#settings .pop-sep {
|
||||
display: none !important;
|
||||
}
|
||||
.set2-group {
|
||||
background-color: #f8f8f8;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 10px;
|
||||
padding-bottom: 2px;
|
||||
margin: 3px;
|
||||
gap: 1.5px;
|
||||
}
|
||||
.set2-group .var-row {
|
||||
margin: 0 7px 0 7px !important;
|
||||
}
|
||||
.set2-group .var-row label {
|
||||
margin-right: 25px;
|
||||
}
|
||||
.set2-group .set-header {
|
||||
background-color: #ddd !important;
|
||||
padding: 5px !important;
|
||||
margin: 0 0 3px 0 !important;
|
||||
border-top-left-radius: 10px !important;
|
||||
border-top-right-radius: 10px !important;
|
||||
|
||||
}
|
||||
.set2-group .set-header a {
|
||||
text-align: center;
|
||||
font-weight: bold;
|
||||
flex-grow: 1;
|
||||
}
|
||||
.set2-group .set-header hr {
|
||||
border: 0 !important;
|
||||
flex-grow: 0 !important;
|
||||
max-width: 0 !important;
|
||||
max-height: 0 o !important;
|
||||
}
|
||||
.pop-sep {
|
||||
border: 0 !important;
|
||||
padding: 0 !important;
|
||||
|
|
|
|||
|
|
@ -267,8 +267,10 @@
|
|||
<div><label>Device</label><span id="mode-device"></span></div>
|
||||
<div><label>Profile</label><span id="mode-profile"></span></div>
|
||||
</div>
|
||||
<div class="chonk"></div>
|
||||
<div id="settings" class="f-col grow"></div>
|
||||
<!-- <div class="chonk"></div> -->
|
||||
<div id="settings" class="f-col grow">
|
||||
<div id="fdm-layers" class="f-col set2-group mode-fdm"></div>
|
||||
</div>
|
||||
<div class="chonk"></div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue