20220117_4

qubyedev · Jan 16, 2022 · fe6acfb · fe6acfb
1 parent 5c2c311
commit fe6acfb
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/Sources/CalendarStyle.swift b/Sources/CalendarStyle.swift
@@ -71,7 +71,7 @@ public struct TimelineStyle {
   public var verticalDiff: CGFloat = 150//50 0115 by Yuan
   public var verticalInset: CGFloat = 10
   public var leadingInset: CGFloat = 53
-  public var eventGap: CGFloat = 0
+  public var eventGap: CGFloat = 2
   public init() {}
 }
 

diff --git a/Sources/Timeline/TimelineView.swift b/Sources/Timeline/TimelineView.swift
@@ -254,17 +254,17 @@ public final class TimelineView: UIView {
         super.draw(rect)
 
         var hourToRemoveIndex = -1
-
-        if isToday {
-            let minute = component(component: .minute, from: currentTime)
-            let hour = component(component: .hour, from: currentTime)
-//          let minute = currentTime.minute
-//          if minute > 39 {
-//            hourToRemoveIndex = hour + 1
-//          } else if minute < 21 {
-//            hourToRemoveIndex = hour
-//          }
-        }
+//
+//        if isToday {
+//            let minute = component(component: .minute, from: currentTime)
+//            let hour = component(component: .hour, from: currentTime)
+////          let minute = currentTime.minute
+////          if minute > 39 {
+////            hourToRemoveIndex = hour + 1
+////          } else if minute < 21 {
+////            hourToRemoveIndex = hour
+////          }
+//        }
 
         let mutableParagraphStyle = NSParagraphStyle.default.mutableCopy() as! NSMutableParagraphStyle
         mutableParagraphStyle.lineBreakMode = .byWordWrapping
@@ -301,7 +301,7 @@ public final class TimelineView: UIView {
                                   width: 53, height: fontSize + 2)
 
           var timeString = NSString(string: time)
-            print("timeString: \(timeString)")
+//            print("timeString: \(timeString)")
             timeString = (time == "12:00") ? NSString(string: "12:00 PM") : NSString(string: time)
 
 //            print("test 0116 time: \(time)")
@@ -499,9 +499,9 @@ public final class TimelineView: UIView {
       let eventView = eventViews[idx]
       eventView.frame = attributes.frame
 
-//      let x: CGFloat = attributes.frame.minX
+      let x: CGFloat = attributes.frame.minX + 7
 
-      eventView.frame = CGRect(x: 60,
+      eventView.frame = CGRect(x: x,
                                y: attributes.frame.minY,
                                width: attributes.frame.width - style.eventGap,
                                height: attributes.frame.height - style.eventGap)