diff --git a/src/kiri/init.js b/src/kiri/init.js index 83c5dc50..9930a497 100644 --- a/src/kiri/init.js +++ b/src/kiri/init.js @@ -2445,13 +2445,13 @@ gapp.register("kiri.init", [], (root, exports) => { return lbl; } - for (let mode of ["fdm","sla","cam","laser"]) { - if (api.feature.modes.indexOf(mode) >= 0) { - $(`mode-${mode}`).appendChild(mksvg(icons[mode])); - } else { - $(`mode-${mode}`).style.display = 'none'; - } - } + // for (let mode of ["fdm","sla","cam","laser"]) { + // if (api.feature.modes.indexOf(mode) >= 0) { + // $(`mode-${mode}`).appendChild(mksvg(icons[mode])); + // } else { + // $(`mode-${mode}`).style.display = 'none'; + // } + // } api.platform.update_size(); @@ -2789,10 +2789,10 @@ gapp.register("kiri.init", [], (root, exports) => { $('view-left').onclick = space.view.left; $('view-right').onclick = space.view.right; $('view-clear').onclick = api.platform.clear; - $('mode-fdm').onclick = () => { api.mode.set('FDM'); api.space.set_focus() }; - $('mode-sla').onclick = () => { api.mode.set('SLA'); api.space.set_focus() }; - $('mode-cam').onclick = () => { api.mode.set('CAM'); api.space.set_focus() }; - $('mode-laser').onclick = () => { api.mode.set('LASER'); api.space.set_focus() }; + // $('mode-fdm').onclick = () => { api.mode.set('FDM'); api.space.set_focus() }; + // $('mode-sla').onclick = () => { api.mode.set('SLA'); api.space.set_focus() }; + // $('mode-cam').onclick = () => { api.mode.set('CAM'); api.space.set_focus() }; + // $('mode-laser').onclick = () => { api.mode.set('LASER'); api.space.set_focus() }; $('unrotate').onclick = () => { api.widgets.for(w => w.unrotate()); api.selection.update_info(); diff --git a/src/kiri/main.js b/src/kiri/main.js index a5f4f281..d021c3ae 100644 --- a/src/kiri/main.js +++ b/src/kiri/main.js @@ -844,7 +844,7 @@ gapp.register("kiri.main", [], (root, exports) => { switch (mode) { case VIEWS.ARRANGE: api.function.clear_progress(); - UI.back.style.display = ''; + // UI.back.style.display = ''; UI.render.style.display = ''; kiri.client.clear(); STACKS.clear(); @@ -907,14 +907,14 @@ gapp.register("kiri.main", [], (root, exports) => { modename.onchange = (ev) => setMode(optlist[options.selectedIndex]); } // highlight relevant device mode button - ["fdm","sla","cam","laser"].forEach(dev => { - let cl = $(`mode-${dev}`).classList; - if (dev === mode.toLowerCase()) { - cl.add("dev-sel"); - } else { - cl.remove("dev-sel"); - } - }); + // ["fdm","sla","cam","laser"].forEach(dev => { + // let cl = $(`mode-${dev}`).classList; + // if (dev === mode.toLowerCase()) { + // cl.add("dev-sel"); + // } else { + // cl.remove("dev-sel"); + // } + // }); // restore cached device profile for this mode if (current.cdev[mode]) { current.device = clone(current.cdev[mode]); diff --git a/src/kiri/ui.js b/src/kiri/ui.js index c5dbcaa4..36ab04c9 100644 --- a/src/kiri/ui.js +++ b/src/kiri/ui.js @@ -283,16 +283,16 @@ gapp.register("kiri.ui", [], (root, exports) => { row.appendChild(link); } - if (opt.separator) { - const sep = DOC.createElement('div'); - sep.classList.add('set2-sep'); - sep.innerHTML = [ - '
', - '', - '', - ].join(''); - lastDiv.appendChild(sep); - } + // if (opt.separator) { + // const sep = DOC.createElement('div'); + // sep.classList.add('set2-sep'); + // sep.innerHTML = [ + // '', + // '', + // '', + // ].join(''); + // lastDiv.appendChild(sep); + // } addModeControls(row, opt); lastGroup = groups[group] = []; diff --git a/web/kiri/index.css b/web/kiri/index.css index 524529d2..afaff40c 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -382,6 +382,15 @@ th, tr, td, label { font-weight: bold; } +.b0 { + border: 0px; +} +.bt1 { + border: 1px solid transparent; +} +.bt2 { + border: 2px solid transparent; +} .contents { display: contents; } @@ -391,6 +400,15 @@ th, tr, td, label { .noshow { display: none; } +.gap1 { + gap: 1px; +} +.gap2 { + gap: 2px; +} +.gap3 { + gap: 3px; +} .grid { display: grid; } @@ -839,6 +857,31 @@ th, tr, td, label { #ft-mesh { min-width: 200px; } +#menu-render { + gap: 3px; + flex-direction: row;; +} +#menu-render > span { + width: 20px; + height: 20px; + display: flex; + flex-shrink: 0; + flex-direction: column; +} +#menu-render > span > * { + padding: 0; + margin: 0; + width: 20px; + height: 20px; + align-items: stretch; + justify-content: stretch; +} +#render-hide > a { + border: 0.5px dashed black; + border-radius: 2px; + width: 17px; + height: 17px; +} #mesh-info { grid-gap: 2px; grid-template-rows: auto auto auto; diff --git a/web/kiri/index.html b/web/kiri/index.html index 81cce9e4..aff66214 100644 --- a/web/kiri/index.html +++ b/web/kiri/index.html @@ -131,29 +131,6 @@ - @@ -345,6 +322,26 @@ +