change doc decorations rotation icon to bottom right. cleaned up lock icon. fixed autoresetview of collections to not fire when dragging.

3 files changed, 15 insertions, 12 deletions

diff --git a/src/client/views/DocumentDecorations.scss b/src/client/views/DocumentDecorations.scss
index 2764339e6..f41cf1385 100644
--- a/src/client/views/DocumentDecorations.scss
+++ b/src/client/views/DocumentDecorations.scss
@@ -14,8 +14,9 @@ $resizeHandler: 8px;
         border-radius: 100%;
         height: 30;
         width: 30;
-        right: -30;
-        top: calc(50% - 15px);
+        right: -40;
+        bottom: -40;
+        //top: calc(50% - 15px);
         position: absolute;
         pointer-events: all;
         cursor: pointer;
@@ -364,15 +365,19 @@ $resizeHandler: 8px;
         position: relative;
         background: black;
         color: rgb(145, 144, 144);
-        height: 14;
-        width: 14;
+        height: 20;
+        width: 20;
         pointer-events: all;
         margin: auto;
         display: flex;
         align-items: center;
-        flex-direction: column;
-        border-radius: 15%;
+        border-radius: 100%;
         cursor: default;
+        svg {
+            width: 10;
+            height: 10;
+            margin: auto;
+        }
     }
 
     .documentDecorations-rotationPath {
diff --git a/src/client/views/DocumentDecorations.tsx b/src/client/views/DocumentDecorations.tsx
index 8b8b7fa4d..f40d2ae8b 100644
--- a/src/client/views/DocumentDecorations.tsx
+++ b/src/client/views/DocumentDecorations.tsx
@@ -845,9 +845,7 @@ export class DocumentDecorations extends React.Component<{ PanelWidth: number; P
                     &nbsp; */}
                     </div>
                 </div>
-            ) : (
-                <div />
-            );
+            ) : null;
 
         const titleArea = this._editingTitle ? (
             <input
@@ -946,7 +944,7 @@ export class DocumentDecorations extends React.Component<{ PanelWidth: number; P
                                     key="rad"
                                     className="documentDecorations-borderRadius"
                                     style={{
-                                        background: `${this._isRounding ? Colors.MEDIUM_BLUE : undefined}`,
+                                        background: `${this._isRounding ? Colors.MEDIUM_BLUE : SettingsManager.userColor}`,
                                         transform: `translate(${radiusHandleLocation ?? 0}px, ${(radiusHandleLocation ?? 0) + (this._showNothing ? 0 : this._titleHeight)}px)`,
                                     }}
                                     onPointerDown={this.onRadiusDown}
@@ -980,7 +978,7 @@ export class DocumentDecorations extends React.Component<{ PanelWidth: number; P
                                     }}>
                                     {this._isRotating ? null : (
                                         <Tooltip enterDelay={750} title={<div className="dash-tooltip">tap to set rotate center, drag to rotate</div>}>
-                                            <div className="documentDecorations-rotation" style={{ pointerEvents: 'all', background: 'transparent' }} onPointerDown={this.onRotateDown} onContextMenu={e => e.preventDefault()}>
+                                            <div className="documentDecorations-rotation" onPointerDown={this.onRotateDown} onContextMenu={e => e.preventDefault()}>
                                                 <IconButton icon={<FaUndo />} color={SettingsManager.userColor} />
                                             </div>
                                         </Tooltip>
diff --git a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
index 5eff6b8e0..6c1308c0a 100644
--- a/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
+++ b/src/client/views/collections/collectionFreeForm/CollectionFreeFormView.tsx
@@ -1631,7 +1631,7 @@ export class CollectionFreeFormView extends CollectionSubView<Partial<collection
 
                 this._disposers.active = reaction(
                     () => this.isContentActive(), // if autoreset is on, then whenever the view is selected, it will be restored to it default pan/zoom positions
-                    active => this.rootDoc[this.autoResetFieldKey] && active && this.resetView()
+                    active => !SnappingManager.GetIsDragging() && this.rootDoc[this.autoResetFieldKey] && active && this.resetView()
                 );
 
                 this._disposers.fitContent = reaction(