Remove element view margins

JPluto · Nov 22, 2012 · 0659a60 · 0659a60
1 parent d443590
commit 0659a60
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/CoconutKit-demo/Sources/Demos/View/Cursor/CursorDemoViewController.m b/CoconutKit-demo/Sources/Demos/View/Cursor/CursorDemoViewController.m
@@ -102,6 +102,8 @@ - (void)viewDidLoad
 
     self.timeScalesCursor.dataSource = self;
     self.timeScalesCursor.delegate = self;
+    // Not perfectly centered with the font used. Tweak a little bit to get a perfect result
+    self.timeScalesCursor.pointerViewTopLeftOffset = CGSizeMake(-11.f, -12.f);
 
     self.foldersCursor.dataSource = self;
     self.foldersCursor.delegate = self;

diff --git a/CoconutKit/Sources/View/HLSCursor.h b/CoconutKit/Sources/View/HLSCursor.h
@@ -74,10 +74,10 @@
 
 /**
  * Pointer view offsets. Use these offsets to make the pointer rectangle larger or smaller than the element it points
- * at. By default the pointer view frame matches the one of the underlying element
+ * at
  */
-@property (nonatomic, assign) CGSize pointerViewTopLeftOffset;              // Default is (0px, 0px); set negative values to grow larger
-@property (nonatomic, assign) CGSize pointerViewBottomRightOffset;          // Default is (0px, 0px); set negative values to grow larger
+@property (nonatomic, assign) CGSize pointerViewTopLeftOffset;              // Default is (-10px, -10px); set negative values to grow larger
+@property (nonatomic, assign) CGSize pointerViewBottomRightOffset;          // Default is (10px, 10px); set negative values to grow larger
 
 /**
  * Get the currently selected element. During the time the pointer is moved the selected index is not updated. This value

diff --git a/CoconutKit/Sources/View/HLSCursor.m b/CoconutKit/Sources/View/HLSCursor.m
@@ -85,8 +85,8 @@ - (void)dealloc
 
 - (void)hlsCursorInit
 {
-    self.pointerViewTopLeftOffset = CGSizeMake(0.f, 0.f);
-    self.pointerViewBottomRightOffset = CGSizeMake(0.f, 0.f);
+    self.pointerViewTopLeftOffset = CGSizeMake(-10.f, -10.f);
+    self.pointerViewBottomRightOffset = CGSizeMake(10.f, 10.f);
 
     self.animated = YES;
 }
@@ -292,8 +292,8 @@ - (UIView *)elementViewForIndex:(NSUInteger)index selected:(BOOL)selected
         CGSize otherTitleSize = [title sizeWithFont:otherFont];
         UILabel *elementLabel = [[[UILabel alloc] initWithFrame:CGRectMake(0.f,
                                                                            0.f,
-                                                                           floatmax(titleSize.width, otherTitleSize.width) + 10.f,
-                                                                           floatmax(titleSize.height, otherTitleSize.height) + 10.f)]
+                                                                           floatmax(titleSize.width, otherTitleSize.width),
+                                                                           floatmax(titleSize.height, otherTitleSize.height))]
                                  autorelease];
         elementLabel.text = title;
         elementLabel.backgroundColor = [UIColor clearColor];
@@ -325,8 +325,8 @@ - (UIView *)elementWrapperViewForIndex:(NSUInteger)index
 
     UIView *wrapperView = [[[UIView alloc] initWithFrame:CGRectMake(0.f,
                                                                     0.f,
-                                                                    floatmax(CGRectGetWidth(elementView.frame), CGRectGetWidth(selectedElementView.frame) + 10.f),
-                                                                    floatmax(CGRectGetHeight(elementView.frame), CGRectGetHeight(selectedElementView.frame) + 10.f))] autorelease];
+                                                                    floatmax(CGRectGetWidth(elementView.frame), CGRectGetWidth(selectedElementView.frame)),
+                                                                    floatmax(CGRectGetHeight(elementView.frame), CGRectGetHeight(selectedElementView.frame)))] autorelease];
     wrapperView.backgroundColor = [UIColor clearColor];
 
     [wrapperView addSubview:elementView];