From f45db5383dc6c0c7c565c688ae2f0238e74f3ff4 Mon Sep 17 00:00:00 2001
From: Kelvin Sherlock <ksherlock@gmail.com>
Date: Sun, 6 Sep 2020 11:25:59 -0400
Subject: [PATCH] only show the media drag handle when moused over.

---
 Ample/Base.lproj/MediaView.xib | 11 ++++++-----
 Ample/MediaViewController.h    |  2 +-
 Ample/MediaViewController.m    | 20 +++++++++++++++++++-
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/Ample/Base.lproj/MediaView.xib b/Ample/Base.lproj/MediaView.xib
index 7dae8c1..13d114f 100644
--- a/Ample/Base.lproj/MediaView.xib
+++ b/Ample/Base.lproj/MediaView.xib
@@ -17,7 +17,7 @@
         <scrollView borderType="none" autohidesScrollers="YES" horizontalLineScroll="20" horizontalPageScroll="10" verticalLineScroll="20" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" horizontalScrollElasticity="none" id="nVT-kT-bWl">
             <rect key="frame" x="0.0" y="0.0" width="306" height="363"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <clipView key="contentView" autoresizesSubviews="NO" copiesOnScroll="NO" id="IBD-wb-pch">
+            <clipView key="contentView" autoresizesSubviews="NO" focusRingType="none" copiesOnScroll="NO" id="IBD-wb-pch">
                 <rect key="frame" x="0.0" y="0.0" width="306" height="363"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
@@ -81,7 +81,7 @@
                                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                         <subviews>
                                             <pathControl focusRingType="none" verticalHuggingPriority="750" fixedFrame="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="f7R-TO-fmF">
-                                                <rect key="frame" x="41" y="1" width="207" height="22"/>
+                                                <rect key="frame" x="25" y="1" width="223" height="22"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                 <pathCell key="cell" controlSize="small" selectable="YES" editable="YES" focusRingType="none" alignment="left" pathStyle="popUp" id="dcz-8y-tKb">
                                                     <font key="font" metaFont="smallSystem"/>
@@ -101,13 +101,14 @@
                                                     <action selector="ejectAction:" target="-2" id="XAl-eQ-nUj"/>
                                                 </connections>
                                             </button>
-                                            <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" id="6g1-NT-J1w">
-                                                <rect key="frame" x="3" y="3" width="33" height="20"/>
+                                            <imageView hidden="YES" horizontalHuggingPriority="251" verticalHuggingPriority="251" id="6g1-NT-J1w">
+                                                <rect key="frame" x="0.0" y="3" width="20" height="20"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="NSListViewTemplate" id="x7F-qD-5y9"/>
+                                                <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageAlignment="left" image="NSListViewTemplate" id="x7F-qD-5y9"/>
                                             </imageView>
                                         </subviews>
                                         <connections>
+                                            <outlet property="dragHandle" destination="6g1-NT-J1w" id="odc-Sw-3WS"/>
                                             <outlet property="ejectButton" destination="zNo-ij-mUl" id="uzY-tA-5Wf"/>
                                             <outlet property="pathControl" destination="f7R-TO-fmF" id="oH7-N3-JC7"/>
                                         </connections>
diff --git a/Ample/MediaViewController.h b/Ample/MediaViewController.h
index 89ce151..36103ce 100644
--- a/Ample/MediaViewController.h
+++ b/Ample/MediaViewController.h
@@ -29,7 +29,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface TablePathView : NSTableCellView
 @property (weak) IBOutlet NSPathControl *pathControl;
 @property (weak) IBOutlet NSButton *ejectButton;
-
+@property (weak) IBOutlet NSImageView *dragHandle;
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Ample/MediaViewController.m b/Ample/MediaViewController.m
index 40b29db..570bbc3 100644
--- a/Ample/MediaViewController.m
+++ b/Ample/MediaViewController.m
@@ -9,7 +9,25 @@
 #import "MediaViewController.h"
 
 
-@implementation TablePathView
+@implementation TablePathView {
+    NSTrackingRectTag _trackingRect;
+}
+
+-(void)viewDidMoveToSuperview {
+    if (_trackingRect) {
+        [self removeTrackingRect: _trackingRect];
+    }
+    NSRect rect = [_dragHandle frame];
+    _trackingRect = [self addTrackingRect: rect owner: self userData: NULL assumeInside:NO];
+}
+
+-(void)mouseEntered:(NSEvent *)event {
+    [_dragHandle setHidden: NO];
+}
+
+-(void)mouseExited:(NSEvent *)event {
+    [_dragHandle setHidden: YES];
+}
 
 @end