passcode

Author: overtake

TGUIKit/TGUIKit/ScrollView.swift

@@ -14,11 +14,7 @@ public enum ScrollDirection {
     case none;
 }
 
-private class Scroller : NSScroller {
-    fileprivate override func sendAction(on mask: NSEventMask) -> Int {
-        return super.sendAction(on: mask)
-    }
-}
+
 
 public struct ScrollPosition : Equatable {
     public private(set) var rect:NSRect
@@ -37,7 +33,6 @@ public func ==(lhs:ScrollPosition, rhs:ScrollPosition) -> Bool {
 open class ScrollView: NSScrollView, CALayerDelegate{
     private var currentpos:ScrollPosition = ScrollPosition()
     public var deltaCorner:Int64 = 60
-    private var scroller:Scroller?
 
     public var scrollPosition:ScrollPosition {
 
@@ -99,7 +94,6 @@ open class ScrollView: NSScrollView, CALayerDelegate{
      override public init(frame frameRect: NSRect) {
         super.init(frame: frameRect)
 
-        scroller = Scroller(frame: self.bounds)
         self.wantsLayer = true;
 
         self.layer?.delegate = self
@@ -118,6 +112,9 @@ open class ScrollView: NSScrollView, CALayerDelegate{
 
 
 
+        self.horizontalScroller?.scrollerStyle = .overlay
+        self.verticalScroller?.scrollerStyle = .overlay
+        
       //  verticalScrollElasticity = .automatic
         //allowsMagnification = true
         //self.hasVerticalScroller = false
@@ -126,6 +123,15 @@ open class ScrollView: NSScrollView, CALayerDelegate{
 
     }
 
+    open override var scrollerStyle: NSScrollerStyle {
+        set {
+            super.scrollerStyle = .overlay
+        }
+        get {
+            return .overlay
+        }
+    }
+    
 
 //    
 //    open override var hasVerticalScroller: Bool {

TGUIKit/TGUIKit/SearchView.swift

@@ -304,7 +304,7 @@ public class SearchView: OverlayControl, NSTextViewDelegate {
             progressIndicator.stopAnimation(self)
             progressIndicator.removeFromSuperview()
             progressIndicator.isHidden = true
-            clear.isHidden = self.state == .Focus && (self.input.string ?? "").length == 0
+            clear.isHidden = self.state == .None
         }
     }
 

TGUIKit/TGUIKit/TableView.swift

@@ -1233,52 +1233,68 @@ open class TableView: ScrollView, NSTableViewDelegate,NSTableViewDataSource,Sele
 
         let s = self.frame.size
 
-        if animated {
+        if animated && !tableView.isFlipped {
 
 
             //if !tableView.isFlipped {
 
-                let y =  (s.height - size.height)
-                
-                CATransaction.begin()
-
-              //  if y < 0 {
-                    
-                var presentBounds:NSRect = self.layer?.bounds ?? self.bounds
-                var presentation = self.layer?.presentation()
-                if let presentation = presentation, self.layer?.animation(forKey:"bounds") != nil {
+            
+            
+            CATransaction.begin()
+            
+            //  if y < 0 {
+            
+            var presentBounds:NSRect = self.layer?.bounds ?? self.bounds
+            var presentation = self.layer?.presentation()
+            if let presentation = presentation, self.layer?.animation(forKey:"bounds") != nil {
+                presentBounds = presentation.bounds
+            }
+            
+            self.layer?.animateBounds(from: presentBounds, to: NSMakeRect(0, self.bounds.minY, size.width, size.height), duration: 0.2, timingFunction: kCAMediaTimingFunctionEaseOut)
+            
+            
+            var y = (size.height - presentBounds.height)
+            
+        //    if (y > 0) {
+                presentBounds = contentView.layer?.bounds ?? contentView.bounds
+                if let presentation = contentView.layer?.presentation(), contentView.layer?.animation(forKey:"bounds") != nil {
                     presentBounds = presentation.bounds
                 }
 
-                self.layer?.animateBounds(from: presentBounds, to: NSMakeRect(0, self.bounds.minY, size.width, size.height), duration: 0.2, timingFunction: kCAMediaTimingFunctionEaseOut)
-                
-                
-            
-                if (y > 0) {
-                    var presentBounds:NSRect = contentView.layer?.bounds ?? contentView.bounds
-                    presentation = contentView.layer?.presentation()
-                    if let presentation = presentation, contentView.layer?.animation(forKey:"bounds") != nil {
-                        presentBounds = presentation.bounds
-                    }
+                if y > 0 {
+                    presentBounds.origin.y -= y
                     presentBounds.size.height += y
-                    contentView.layer?.animateBounds(from: presentBounds, to: NSMakeRect(0, contentView.bounds.minY, size.width, size.height), duration: 0.2, timingFunction: kCAMediaTimingFunctionEaseOut)
-                    
+                } else {
+                    presentBounds.origin.y += y
+                    presentBounds.size.height -= y
                 }
-         //   }
-            if !tableView.isFlipped {
-                var currentY:CGFloat = 0
 
-                presentation = contentView.layer?.presentation()
-                if let presentation = presentation, contentView.layer?.animation(forKey:"position") != nil {
-                    currentY = presentation.position.y
-                }
+                contentView.layer?.animateBounds(from: presentBounds, to: NSMakeRect(0, contentView.bounds.minY, size.width, size.height), duration: 0.2, timingFunction: kCAMediaTimingFunctionEaseOut)
 
-                let pos = contentView.layer?.position ?? NSZeroPoint
-                contentView.layer?.animatePosition(from: NSMakePoint(0,currentY + (y > 0 ? -y : y)), to: pos, duration: 0.2, timingFunction: kCAMediaTimingFunctionEaseOut)
-            }
+        //    }
+//            else if !tableView.isFlipped {
+//                var currentY:CGFloat = 0
+//                
+//                presentation = contentView.layer?.presentation()
+//                if let presentation = presentation, contentView.layer?.animation(forKey:"position") != nil {
+//                    currentY = presentation.position.y
+//                }
+//                
+//                //let realY = abs(size.height - )
+//                
+//                let pos = contentView.layer?.position ?? NSZeroPoint
+//                
+//                NSLog("\(currentY) y: \(y)")
+//                //                if currentY == 0 {
+//                //                    currentY
+//                //                } else {
+//                //
+//                //                }
+//                contentView.layer?.animatePosition(from: NSMakePoint(0, -y), to: pos, duration: 0.2, timingFunction: kCAMediaTimingFunctionEaseOut)
+//            }
 
 
-                CATransaction.commit()
+            CATransaction.commit()
 
           //  }
         }