From 1f663f3cc970d25bc52c845b40a8509b65d4865d Mon Sep 17 00:00:00 2001 From: Stewart Allen Date: Thu, 25 Dec 2025 22:16:13 -0500 Subject: [PATCH] properly handle expanding preview in developer mode --- mods/bambu/bambu.js | 2 +- src/kiri/app/export.js | 7 ++++--- src/kiri/app/modal.js | 3 +++ web/kiri/index.css | 14 ++++++++++++++ 4 files changed, 22 insertions(+), 4 deletions(-) diff --git a/mods/bambu/bambu.js b/mods/bambu/bambu.js index 53faa3eb..ebc6f9c7 100644 --- a/mods/bambu/bambu.js +++ b/mods/bambu/bambu.js @@ -1253,7 +1253,7 @@ self.kiri.load(api => { } function prep_export(gen3mf, gcode, info, settings) { - if (!settings.device.extras?.bbl || api.ui.deviceSave.disabled) { + if (!settings.device.extras?.bbl || api.ui.devices.save.disabled) { $('bambu-output').style.display = 'none'; return; } diff --git a/src/kiri/app/export.js b/src/kiri/app/export.js index 4e44302d..8e682a35 100644 --- a/src/kiri/app/export.js +++ b/src/kiri/app/export.js @@ -328,7 +328,8 @@ function exportGCodeDialog(gcode, sections, info, names) { api.modal.show('xany'); let set = api.conf.get(); let fdm = MODE === MODES.FDM; - let octo = set.controller.exportOcto && MODE !== MODES.CAM; + let cam = MODE === MODES.CAM; + let octo = set.controller.exportOcto && !cam; let preview = set.controller.exportPreview; $('code-preview-head').style.display = preview ? '' : 'none'; $('code-preview').style.display = preview ? '' : 'none'; @@ -337,8 +338,8 @@ function exportGCodeDialog(gcode, sections, info, names) { $('print-filename').value = filename; $('print-filesize').value = util.comma(info.bytes); $('print-length').value = Math.round(info.distance); - if (set.controller.devel) { - $('code-preview-textarea').style.height = "30em"; + if ((fdm || cam) && preview && set.controller.devel) { + document.body.classList.add('devel'); } calcTime(); if (fdm) { diff --git a/src/kiri/app/modal.js b/src/kiri/app/modal.js index 893e0ab2..74d19fa8 100644 --- a/src/kiri/app/modal.js +++ b/src/kiri/app/modal.js @@ -60,6 +60,9 @@ class ModalControl { visible = modal.visible(), info = { pct: 0 }; + // if the dialog needs it, it will re-add it + document.body.classList.remove('devel'); + // hide all modals before showing another Object.keys(modal.#ui.modals).forEach(name => { modal.#ui.modals[name].style.display = name === which ? 'flex' : ''; diff --git a/web/kiri/index.css b/web/kiri/index.css index 6d09ee00..4da46c58 100644 --- a/web/kiri/index.css +++ b/web/kiri/index.css @@ -2615,3 +2615,17 @@ details[open] summary::after { .range-detail span { flex-grow: 1; } + +.devel #modal-box { + height: 80%; +} +.devel #mod-x-any { + height: 100%; +} +.devel #code-preview { + flex-grow: 1; +} +.devel #code-preview > div, +.devel #code-preview-textarea { + height: 100%; +} \ No newline at end of file