aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbobzel <zzzman@gmail.com>2023-10-30 11:40:49 -0400
committerbobzel <zzzman@gmail.com>2023-10-30 11:40:49 -0400
commit8a6ed7624fa1eb8b0b38a51e3f77af159c7cb09f (patch)
treeb2e5bbc47d26347770f95469bf988a4c5a05742a
parent7e01a1fdad85e5aa3d73f166b7663d34337bb040 (diff)
fix for group child dragging that still allows titles to be clipped when border radius is set.
-rw-r--r--src/client/views/nodes/DocumentView.scss4
-rw-r--r--src/client/views/nodes/trails/PresBox.tsx4
2 files changed, 5 insertions, 3 deletions
diff --git a/src/client/views/nodes/DocumentView.scss b/src/client/views/nodes/DocumentView.scss
index 874723895..931594568 100644
--- a/src/client/views/nodes/DocumentView.scss
+++ b/src/client/views/nodes/DocumentView.scss
@@ -24,7 +24,8 @@
width: 100%;
height: 100%;
border-radius: inherit;
- overflow: hidden; // need this so that title will be clipped when borderRadius is set
+ // bcz: can't clip the title this way because groups need to be able to render outside of overflow region to support drag/drop-extending the group borders
+ // overflow: hidden; // need this so that title will be clipped when borderRadius is set
// transition: outline 0.3s linear;
// background: $white; //overflow: hidden;
@@ -166,6 +167,7 @@
height: 100%;
border-radius: inherit;
white-space: normal;
+ overflow: hidden; // so that titles will clip when borderRadius is set
.documentView-styleContentWrapper {
width: 100%;
diff --git a/src/client/views/nodes/trails/PresBox.tsx b/src/client/views/nodes/trails/PresBox.tsx
index 944302934..ceeb10d93 100644
--- a/src/client/views/nodes/trails/PresBox.tsx
+++ b/src/client/views/nodes/trails/PresBox.tsx
@@ -792,7 +792,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
willPan: activeItem.presentation_movement !== PresMovement.None,
willZoomCentered: activeItem.presentation_movement === PresMovement.Zoom || activeItem.presentation_movement === PresMovement.Jump || activeItem.presentation_movement === PresMovement.Center,
zoomScale: activeItem.presentation_movement === PresMovement.Center ? 0 : NumCast(activeItem.config_zoom, 1),
- zoomTime: activeItem.presentation_movement === PresMovement.Jump ? 0 : Math.min(Math.max(effect ? 750 : 500, (effect ? 0.2 : 1) * presTime), presTime),
+ zoomTime: activeItem.presentation_movement === PresMovement.Jump ? 0 : Math.min(Math.max(effect ? 750 : 500, (effect ? 1 : 1) * presTime), presTime),
effect: activeItem,
noSelect: true,
openLocation: OpenWhere.addLeft,
@@ -864,7 +864,7 @@ export class PresBox extends ViewBoxBaseComponent<FieldViewProps>() {
opacity = 0;
}
}
- opacity !== undefined && (tagDoc.opacity = opacity);
+ opacity !== undefined && (tagDoc.opacity = opacity === 1 ? undefined : opacity);
});
};