AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix tabs to work as expected with updated z bottom code

Browse source
This commit is contained in:
Stewart Allen 2022-10-06 08:49:20 -04:00
commit b3e789ab1c
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/kiri-mode/cam/client.js
View file

@ -1262,10 +1262,10 @@ function createPopOp(type, map) {
function createTabBox(iw, ic, n) { function createTabBox(iw, ic, n) {
const { track } = iw; const { track } = iw;
const { stock, bounds, process } = API.conf.get(); const { stock, bounds, process } = API.conf.get();
const { camTabsWidth, camTabsHeight, camTabsDepth, camTabsMidline } = process; const { camTabsWidth, camTabsHeight, camTabsDepth, camTabsMidline, camZBottom } = process;
const sz = stock.z || bounds.max.z; const sz = stock.z || bounds.max.z;
const zto = sz - iw.track.top; const zto = sz - iw.track.top;
const zp = sz - track.box.d + process.camZBottom - zto + (camTabsMidline ? 0 : camTabsHeight / 2); const zp = (camZBottom ? camZBottom : sz - track.box.d - zto) + (camTabsMidline ? 0 : camTabsHeight / 2);
ic.x += n.x * camTabsDepth / 2; // offset from part ic.x += n.x * camTabsDepth / 2; // offset from part
ic.z -= n.y * camTabsDepth / 2; // offset swap z,y ic.z -= n.y * camTabsDepth / 2; // offset swap z,y
ic.y = zp; // offset swap in world space y,z ic.y = zp; // offset swap in world space y,z

11
web/kiri/index.css
View file

@ -865,6 +865,12 @@ th, tr, td, label {
background-color: rgba(255,255,255,0.75); background-color: rgba(255,255,255,0.75);
white-space: nowrap; white-space: nowrap;
} }
#oplist > div:hover, #op-add:hover {
background-color: rgba(255,255,255,0.9);
}
#oplist > div.editing {
background-color: rgba(190,230,190,0.85);
}
#oplist .drag { #oplist .drag {
background-color: var(--highlight) !important; background-color: var(--highlight) !important;
} }
@ -881,11 +887,8 @@ th, tr, td, label {
font-size: 12px; font-size: 12px;
color: rgba(0,0,0,0); color: rgba(0,0,0,0);
} }
#oplist > div.editing {
background-color: rgba(220,230,220,0.8);
}
.dark #oplist div:hover .del { .dark #oplist div:hover .del {
color: #fff; color: #777;
} }
#oplist div:hover .del { #oplist div:hover .del {
color: #888; color: #888;