Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Revert "Merged from github's master"

This reverts commit 003ccd0, reversing
changes made to 6c3490c.
  • Loading branch information...
commit 85c718ae792aebe681ecbd71f610d59de93aa199 1 parent 985a238
@adib authored
Showing with 1,714 additions and 5,886 deletions.
  1. +0 −6 .gitmodules
  2. +1 −1  ExampleProject/ConcordeExample/ExampleAppDelegate.m
  3. +2 −2 ExampleProject/ConcordeExample/ExampleScrollView.m
  4. +0 −1  ExampleProject/ConcordeExample/ExampleTableViewCell.h
  5. +0 −16 ExampleProject/ConcordeExample/ExampleTableViewCell.m
  6. +2 −2 ExampleProject/ConcordeExample/ExampleView.h
  7. +22 −25 ExampleProject/ConcordeExample/ExampleView.m
  8. BIN  ExampleProject/ConcordeExample/clock@2x.png
  9. +1 −1  ExampleProject/ConcordeExample/main.m
  10. +0 −6 ExampleProject/Example.xcodeproj/project.pbxproj
  11. +1 −15 LICENSE.txt
  12. +22 −15 README.md
  13. +91 −518 TwUI.xcodeproj/project.pbxproj
  14. +0 −59 TwUI.xcodeproj/xcshareddata/xcschemes/Dynamic Library.xcscheme
  15. +0 −59 TwUI.xcodeproj/xcshareddata/xcschemes/Static Library.xcscheme
  16. +0 −83 TwUI.xcodeproj/xcshareddata/xcschemes/TwUI.xcscheme
  17. +0 −12 TwUITests/TwUITests-Prefix.pch
  18. +13 −0 TwUITests/TwUITests.h
  19. +23 −5 TwUITests/TwUITests.m
  20. +0 −1  TwUITests/specta
  21. +0 −39 lib/Support/CALayer+TUIExtensions.h
  22. +0 −55 lib/Support/CALayer+TUIExtensions.m
  23. +0 −22 lib/Support/CATransaction+TUIExtensions.h
  24. +0 −22 lib/Support/CATransaction+TUIExtensions.m
  25. +0 −18 lib/Support/NSFont+TUIExtensions.h
  26. +0 −23 lib/Support/NSFont+TUIExtensions.m
  27. +0 −15 lib/Support/NSTextView+TUIExtensions.h
  28. +0 −42 lib/Support/NSTextView+TUIExtensions.m
  29. +0 −36 lib/Support/TUICAAction.h
  30. +0 −261 lib/Support/TUICAAction.m
  31. +0 −19 lib/UIKit/NSClipView+TUIExtensions.h
  32. +0 −50 lib/UIKit/NSClipView+TUIExtensions.m
  33. +0 −27 lib/UIKit/NSColor+TUIExtensions.h
  34. +0 −93 lib/UIKit/NSColor+TUIExtensions.m
  35. +0 −67 lib/UIKit/NSImage+TUIExtensions.h
  36. +0 −211 lib/UIKit/NSImage+TUIExtensions.m
  37. +0 −23 lib/UIKit/NSScrollView+TUIExtensions.h
  38. +0 −34 lib/UIKit/NSScrollView+TUIExtensions.m
  39. +0 −29 lib/UIKit/NSView+TUIExtensions.h
  40. +0 −127 lib/UIKit/NSView+TUIExtensions.m
  41. +1 −1  lib/UIKit/TUIActivityIndicatorView.m
  42. +10 −8 lib/UIKit/TUIAttributedString.h
  43. +16 −31 lib/UIKit/TUIAttributedString.m
  44. +0 −50 lib/UIKit/TUIBridgedScrollView.h
  45. +0 −153 lib/UIKit/TUIBridgedView.h
  46. +38 −25 lib/UIKit/TUIButton+Content.m
  47. +16 −17 lib/UIKit/TUIButton.h
  48. +12 −53 lib/UIKit/TUIButton.m
  49. +0 −39 lib/UIKit/TUICGAdditions.h
  50. +13 −135 lib/UIKit/TUICGAdditions.m
  51. +91 −0 lib/UIKit/TUIColor.h
  52. +232 −0 lib/UIKit/TUIColor.m
  53. +1 −1  lib/UIKit/TUIControl+Accessibility.m
  54. +5 −7 lib/UIKit/TUIControl.h
  55. +4 −16 lib/UIKit/TUIControl.m
  56. +47 −0 lib/UIKit/TUIFastIndexPath.h
  57. +137 −0 lib/UIKit/TUIFastIndexPath.m
  58. +44 −0 lib/UIKit/TUIFont.h
  59. +148 −0 lib/UIKit/TUIFont.m
  60. +0 −33 lib/UIKit/TUIHostView.h
  61. +35 −0 lib/UIKit/TUIImage+Drawing.h
  62. +57 −0 lib/UIKit/TUIImage.h
  63. +7 −2 lib/UIKit/TUIImageView.h
  64. +18 −19 lib/UIKit/TUIImageView.m
  65. +42 −35 lib/UIKit/TUIKit.h
  66. +88 −0 lib/UIKit/TUIKit.m
  67. +22 −6 lib/UIKit/TUILabel.h
  68. +5 −10 lib/UIKit/TUILabel.m
  69. +0 −161 lib/UIKit/TUILayoutConstraint.h
  70. +0 −181 lib/UIKit/TUILayoutConstraint.m
  71. +0 −65 lib/UIKit/TUILayoutManager.h
  72. +0 −201 lib/UIKit/TUILayoutManager.m
  73. +0 −24 lib/UIKit/TUINSHostView.h
  74. +0 −69 lib/UIKit/TUINSHostView.m
  75. +1 −1  lib/UIKit/TUINSView+Accessibility.m
  76. +4 −5 lib/UIKit/TUINSView+Hyperfocus.m
  77. +0 −20 lib/UIKit/TUINSView+NSTextInputClient.h
  78. +2 −7 lib/UIKit/TUINSView+NSTextInputClient.m
  79. +0 −40 lib/UIKit/TUINSView+Private.h
  80. +5 −5 lib/UIKit/TUINSView.h
  81. +35 −369 lib/UIKit/TUINSView.m
  82. +1 −2  lib/UIKit/TUINSWindow.h
  83. +0 −3  lib/UIKit/TUINSWindow.m
  84. +3 −2 lib/UIKit/TUIPopover.h
  85. +10 −10 lib/UIKit/TUIPopover.m
  86. +0 −38 lib/UIKit/TUIProgressBar.h
  87. +0 −366 lib/UIKit/TUIProgressBar.m
  88. +5 −4 lib/UIKit/TUIScrollKnob.m
  89. +0 −19 lib/UIKit/TUIScrollView+TUIBridgedScrollView.h
  90. +0 −34 lib/UIKit/TUIScrollView+TUIBridgedScrollView.m
  91. +3 −4 lib/UIKit/TUIScrollView.m
  92. +0 −33 lib/UIKit/TUIStretchableImage.h
  93. +0 −181 lib/UIKit/TUIStretchableImage.m
  94. +7 −6 lib/UIKit/TUIStringDrawing.h
  95. +8 −6 lib/UIKit/TUIStringDrawing.m
  96. +0 −17 lib/UIKit/TUIStyledView.h
  97. +0 −40 lib/UIKit/TUIStyledView.m
  98. +9 −9 lib/UIKit/TUITableView+Cell.m
  99. +34 −33 lib/UIKit/TUITableView.h
  100. +47 −48 lib/UIKit/TUITableView.m
  101. +2 −1  lib/UIKit/TUITableViewCell.h
  102. +3 −3 lib/UIKit/TUITableViewCell.m
  103. +1 −3 lib/UIKit/TUITextEditor.m
  104. +4 −4 lib/UIKit/TUITextField.m
  105. +8 −9 lib/UIKit/TUITextRenderer+Event.m
  106. +7 −5 lib/UIKit/TUITextRenderer.h
  107. +8 −16 lib/UIKit/TUITextRenderer.m
  108. +8 −7 lib/UIKit/TUITextView.h
  109. +19 −75 lib/UIKit/TUITextView.m
  110. +2 −4 lib/UIKit/TUITooltipWindow.m
  111. +11 −24 lib/UIKit/TUIView+Animation.m
  112. +4 −5 lib/UIKit/TUIView+Event.m
  113. +0 −27 lib/UIKit/TUIView+Layout.h
  114. +0 −198 lib/UIKit/TUIView+Layout.m
  115. +1 −1  lib/UIKit/TUIView+PasteboardDragging.h
  116. +5 −4 lib/UIKit/TUIView+PasteboardDragging.m
  117. +3 −4 lib/UIKit/TUIView+Private.h
  118. +73 −0 lib/UIKit/TUIView+Private.m
  119. +0 −20 lib/UIKit/TUIView+TUIBridgedView.h
  120. +0 −172 lib/UIKit/TUIView+TUIBridgedView.m
  121. +5 −13 lib/UIKit/TUIView.h
  122. +85 −227 lib/UIKit/TUIView.m
  123. +1 −2  lib/UIKit/TUIViewController.h
  124. +1 −2  lib/UIKit/TUIViewController.m
  125. +0 −58 lib/UIKit/TUIViewNSViewContainer+Private.h
  126. +11 −41 lib/UIKit/TUIViewNSViewContainer.h
  127. +11 −277 lib/UIKit/TUIViewNSViewContainer.m
View
6 .gitmodules
@@ -1,6 +0,0 @@
-[submodule "TwUITests/expecta"]
- path = TwUITests/expecta
- url = git://github.com/github/expecta.git
-[submodule "TwUITests/specta"]
- path = TwUITests/specta
- url = git://github.com/petejkim/specta.git
View
2  ExampleProject/ConcordeExample/ExampleAppDelegate.m
@@ -52,7 +52,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
tuiScrollViewContainer.rootView = scrollExample;
[self showTableViewExampleWindow:nil];
-
+
}
/**
View
4 ExampleProject/ConcordeExample/ExampleScrollView.m
@@ -21,14 +21,14 @@ @implementation ExampleScrollView
- (id)initWithFrame:(CGRect)frame
{
if((self = [super initWithFrame:frame])) {
- self.backgroundColor = [NSColor colorWithCalibratedWhite:0.9 alpha:1.0];
+ self.backgroundColor = [TUIColor colorWithWhite:0.9 alpha:1.0];
_scrollView = [[TUIScrollView alloc] initWithFrame:self.bounds];
_scrollView.autoresizingMask = TUIViewAutoresizingFlexibleSize;
_scrollView.scrollIndicatorStyle = TUIScrollViewIndicatorStyleDark;
[self addSubview:_scrollView];
- TUIImageView *imageView = [[TUIImageView alloc] initWithImage:[NSImage imageNamed:@"large-image.jpeg"]];
+ TUIImageView *imageView = [[TUIImageView alloc] initWithImage:[TUIImage imageNamed:@"large-image.jpeg"]];
[_scrollView addSubview:imageView];
[_scrollView setContentSize:imageView.frame.size];
View
1  ExampleProject/ConcordeExample/ExampleTableViewCell.h
@@ -22,6 +22,5 @@
}
@property (nonatomic, copy) NSAttributedString *attributedString;
-@property (nonatomic, strong) TUIView *textFieldContainer;
@end
View
16 ExampleProject/ConcordeExample/ExampleTableViewCell.m
@@ -34,26 +34,10 @@ - (id)initWithStyle:(TUITableViewCellStyle)style reuseIdentifier:(NSString *)reu
set before it can be drawn, we do that in drawRect: below.
*/
self.textRenderers = [NSArray arrayWithObjects:textRenderer, nil];
-
- NSTextField *textField = [[NSTextField alloc] initWithFrame:NSMakeRect(20, 180, 91, 22)];
- [textField.cell setUsesSingleLineMode:YES];
- [textField.cell setScrollable:YES];
-
- self.textFieldContainer = [[TUIViewNSViewContainer alloc] initWithNSView:textField];
- self.textFieldContainer.backgroundColor = [NSColor blueColor];
- [self addSubview:self.textFieldContainer];
}
return self;
}
-- (void)layoutSubviews {
- [super layoutSubviews];
-
- CGSize textFieldSize = self.textFieldContainer.bounds.size;
- CGFloat textFieldLeft = CGRectGetWidth(self.bounds) - textFieldSize.width - 16;
-
- self.textFieldContainer.frame = CGRectMake(textFieldLeft, 14, textFieldSize.width, textFieldSize.height);
-}
- (NSAttributedString *)attributedString
{
View
4 ExampleProject/ConcordeExample/ExampleView.h
@@ -22,8 +22,8 @@
TUITableView *_tableView;
ExampleTabBar *_tabBar;
- NSFont *exampleFont1;
- NSFont *exampleFont2;
+ TUIFont *exampleFont1;
+ TUIFont *exampleFont2;
}
@end
View
47 ExampleProject/ConcordeExample/ExampleView.m
@@ -25,11 +25,11 @@ @implementation ExampleView
- (id)initWithFrame:(CGRect)frame
{
if((self = [super initWithFrame:frame])) {
- self.backgroundColor = [NSColor colorWithCalibratedWhite:0.9 alpha:1.0];
+ self.backgroundColor = [TUIColor colorWithWhite:0.9 alpha:1.0];
// if you're using a font a lot, it's best to allocate it once and re-use it
- exampleFont1 = [NSFont fontWithName:@"HelveticaNeue" size:15];
- exampleFont2 = [NSFont fontWithName:@"HelveticaNeue-Bold" size:15];
+ exampleFont1 = [TUIFont fontWithName:@"HelveticaNeue" size:15];
+ exampleFont2 = [TUIFont fontWithName:@"HelveticaNeue-Bold" size:15];
CGRect b = self.bounds;
b.origin.y += TAB_HEIGHT;
@@ -60,24 +60,21 @@ Note by default scroll views (and therefore table views) don't
// setup individual tabs
for(TUIView *tabView in _tabBar.tabViews) {
- tabView.backgroundColor = [NSColor clearColor]; // will also set opaque=NO
+ tabView.backgroundColor = [TUIColor clearColor]; // will also set opaque=NO
// let's just teach the tabs how to draw themselves right here - no need to subclass anything
tabView.drawRect = ^(TUIView *v, CGRect rect) {
CGRect b = v.bounds;
CGContextRef ctx = TUIGraphicsGetCurrentContext();
- NSImage *image = [NSImage imageNamed:@"clock"];
+ TUIImage *image = [TUIImage imageNamed:@"clock.png" cache:YES];
CGRect imageRect = ABIntegralRectWithSizeCenteredInRect([image size], b);
if([v.nsView isTrackingSubviewOfView:v]) { // simple way to check if the mouse is currently down inside of 'v'. See the other methods in TUINSView for more.
// first draw a slight white emboss below
CGContextSaveGState(ctx);
-
- CGImageRef cgImage = [image CGImageForProposedRect:&imageRect context:nil hints:nil];
- CGContextClipToMask(ctx, CGRectOffset(imageRect, 0, -1), cgImage);
-
+ CGContextClipToMask(ctx, CGRectOffset(imageRect, 0, -1), image.CGImage);
CGContextSetRGBFillColor(ctx, 1, 1, 1, 0.5);
CGContextFillRect(ctx, b);
CGContextRestoreGState(ctx);
@@ -85,20 +82,20 @@ Note by default scroll views (and therefore table views) don't
// replace image with a dynamically generated fancy inset image
// 1. use the image as a mask to draw a blue gradient
// 2. generate an inner shadow image based on the mask, then overlay that on top
- image = [NSImage tui_imageWithSize:imageRect.size drawing:^(CGContextRef ctx) {
+ image = [TUIImage imageWithSize:imageRect.size drawing:^(CGContextRef ctx) {
CGRect r;
r.origin = CGPointZero;
r.size = imageRect.size;
- CGContextClipToMask(ctx, r, image.tui_CGImage);
+ CGContextClipToMask(ctx, r, image.CGImage);
CGContextDrawLinearGradientBetweenPoints(ctx, CGPointMake(0, r.size.height), (CGFloat[]){0,0,1,1}, CGPointZero, (CGFloat[]){0,0.6,1,1});
- NSImage *innerShadow = [image tui_innerShadowWithOffset:CGSizeMake(0, -1) radius:3.0 color:[NSColor blackColor] backgroundColor:[NSColor cyanColor]];
+ TUIImage *innerShadow = [image innerShadowWithOffset:CGSizeMake(0, -1) radius:3.0 color:[TUIColor blackColor] backgroundColor:[TUIColor cyanColor]];
CGContextSetBlendMode(ctx, kCGBlendModeOverlay);
- CGContextDrawImage(ctx, r, innerShadow.tui_CGImage);
+ CGContextDrawImage(ctx, r, innerShadow.CGImage);
}];
}
- [image drawInRect:imageRect fromRect:NSZeroRect operation:NSCompositeSourceOver fraction:1.0]; // draw 'image' (might be the regular one, or the dynamically generated one)
+ [image drawInRect:imageRect]; // draw 'image' (might be the regular one, or the dynamically generated one)
// draw the index
TUIAttributedString *s = [TUIAttributedString stringWithString:[NSString stringWithFormat:@"%ld", v.tag]];
@@ -129,7 +126,7 @@ - (NSInteger)tableView:(TUITableView *)table numberOfRowsInSection:(NSInteger)se
return 25;
}
-- (CGFloat)tableView:(TUITableView *)tableView heightForRowAtIndexPath:(NSIndexPath *)indexPath
+- (CGFloat)tableView:(TUITableView *)tableView heightForRowAtIndexPath:(TUIFastIndexPath *)indexPath
{
return 50.0;
}
@@ -137,19 +134,19 @@ - (CGFloat)tableView:(TUITableView *)tableView heightForRowAtIndexPath:(NSIndexP
- (TUIView *)tableView:(TUITableView *)tableView headerViewForSection:(NSInteger)section
{
ExampleSectionHeaderView *view = [[ExampleSectionHeaderView alloc] initWithFrame:CGRectMake(0, 0, 100, 32)];
- TUIAttributedString *title = [TUIAttributedString stringWithString:[NSString stringWithFormat:@"Example Section %d", (int)section]];
- title.color = [NSColor blackColor];
+ TUIAttributedString *title = [TUIAttributedString stringWithString:[NSString stringWithFormat:@"Example Section %d", section]];
+ title.color = [TUIColor blackColor];
title.font = exampleFont2;
view.labelRenderer.attributedString = title;
return view;
}
-- (TUITableViewCell *)tableView:(TUITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath
+- (TUITableViewCell *)tableView:(TUITableView *)tableView cellForRowAtIndexPath:(TUIFastIndexPath *)indexPath
{
ExampleTableViewCell *cell = reusableTableCellOfClass(tableView, ExampleTableViewCell);
- TUIAttributedString *s = [TUIAttributedString stringWithString:[NSString stringWithFormat:@"example cell %d", (int)indexPath.row]];
- s.color = [NSColor blackColor];
+ TUIAttributedString *s = [TUIAttributedString stringWithString:[NSString stringWithFormat:@"example cell %d", indexPath.row]];
+ s.color = [TUIColor blackColor];
s.font = exampleFont1;
[s setFont:exampleFont2 inRange:NSMakeRange(8, 4)]; // make the word "cell" bold
cell.attributedString = s;
@@ -157,7 +154,7 @@ - (TUITableViewCell *)tableView:(TUITableView *)tableView cellForRowAtIndexPath:
return cell;
}
-- (void)tableView:(TUITableView *)tableView didClickRowAtIndexPath:(NSIndexPath *)indexPath withEvent:(NSEvent *)event
+- (void)tableView:(TUITableView *)tableView didClickRowAtIndexPath:(TUIFastIndexPath *)indexPath withEvent:(NSEvent *)event
{
if([event clickCount] == 1) {
// do something cool
@@ -167,7 +164,7 @@ - (void)tableView:(TUITableView *)tableView didClickRowAtIndexPath:(NSIndexPath
// show context menu
}
}
-- (BOOL)tableView:(TUITableView *)tableView shouldSelectRowAtIndexPath:(NSIndexPath *)indexPath forEvent:(NSEvent *)event{
+- (BOOL)tableView:(TUITableView *)tableView shouldSelectRowAtIndexPath:(TUIFastIndexPath *)indexPath forEvent:(NSEvent *)event{
switch (event.type) {
case NSRightMouseDown:
return NO;
@@ -176,19 +173,19 @@ - (BOOL)tableView:(TUITableView *)tableView shouldSelectRowAtIndexPath:(NSIndexP
return YES;
}
--(BOOL)tableView:(TUITableView *)tableView canMoveRowAtIndexPath:(NSIndexPath *)indexPath {
+-(BOOL)tableView:(TUITableView *)tableView canMoveRowAtIndexPath:(TUIFastIndexPath *)indexPath {
// return TRUE to enable row reordering by dragging; don't implement this method or return
// FALSE to disable
return TRUE;
}
--(void)tableView:(TUITableView *)tableView moveRowAtIndexPath:(NSIndexPath *)fromIndexPath toIndexPath:(NSIndexPath *)toIndexPath {
+-(void)tableView:(TUITableView *)tableView moveRowAtIndexPath:(TUIFastIndexPath *)fromIndexPath toIndexPath:(TUIFastIndexPath *)toIndexPath {
// update the model to reflect the changed index paths; since this example isn't backed by
// a "real" model, after dropping a cell the table will revert to it's previous state
NSLog(@"Move dragged row: %@ => %@", fromIndexPath, toIndexPath);
}
--(NSIndexPath *)tableView:(TUITableView *)tableView targetIndexPathForMoveFromRowAtIndexPath:(NSIndexPath *)fromPath toProposedIndexPath:(NSIndexPath *)proposedPath {
+-(TUIFastIndexPath *)tableView:(TUITableView *)tableView targetIndexPathForMoveFromRowAtIndexPath:(TUIFastIndexPath *)fromPath toProposedIndexPath:(TUIFastIndexPath *)proposedPath {
// optionally revise the drag-to-reorder drop target index path by returning a different index path
// than proposedPath. if proposedPath is suitable, return that. if this method is not implemented,
// proposedPath is used by default.
View
BIN  ExampleProject/ConcordeExample/clock@2x.png
Deleted file not rendered
View
2  ExampleProject/ConcordeExample/main.m
@@ -31,6 +31,6 @@ int main(int argc, char *argv[])
if((major == 10 && minor >= 7) || major >= 11) {
AtLeastLion = YES;
}
-
+
return NSApplicationMain(argc, (const char **)argv);
}
View
6 ExampleProject/Example.xcodeproj/project.pbxproj
@@ -13,7 +13,6 @@
5C782FD013A54FFF00CF69EF /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C782FCF13A54FFD00CF69EF /* ApplicationServices.framework */; };
5C782FD713A556A900CF69EF /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5C782FD613A556A800CF69EF /* QuartzCore.framework */; };
5C90DB9D13A7C08E00ECDD14 /* ExampleTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 5C90DB9C13A7C08D00ECDD14 /* ExampleTabBar.m */; };
- 5E8A28C81590CB34000D5D2B /* clock@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 5E8A28C71590CB34000D5D2B /* clock@2x.png */; };
5ED56678139DC30300031CDF /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5ED56677139DC30300031CDF /* Cocoa.framework */; };
5ED56682139DC30300031CDF /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 5ED56680139DC30300031CDF /* InfoPlist.strings */; };
5ED56685139DC30300031CDF /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 5ED56684139DC30300031CDF /* main.m */; };
@@ -74,7 +73,6 @@
5C782FD613A556A800CF69EF /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
5C90DB9B13A7C08D00ECDD14 /* ExampleTabBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ExampleTabBar.h; sourceTree = "<group>"; };
5C90DB9C13A7C08D00ECDD14 /* ExampleTabBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ExampleTabBar.m; sourceTree = "<group>"; };
- 5E8A28C71590CB34000D5D2B /* clock@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "clock@2x.png"; sourceTree = "<group>"; };
5ED56673139DC30300031CDF /* Example.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Example.app; sourceTree = BUILT_PRODUCTS_DIR; };
5ED56677139DC30300031CDF /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
5ED5667A139DC30300031CDF /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -175,7 +173,6 @@
isa = PBXGroup;
children = (
D3EC0C481432325A003C162C /* large-image.jpeg */,
- 5E8A28C71590CB34000D5D2B /* clock@2x.png */,
5C57CF3C13A7E7C00032AC1F /* clock.png */,
5ED5667F139DC30300031CDF /* Example-Info.plist */,
5ED56680139DC30300031CDF /* InfoPlist.strings */,
@@ -290,7 +287,6 @@
5ED5668E139DC30300031CDF /* MainMenu.xib in Resources */,
5C57CF3D13A7E7C00032AC1F /* clock.png in Resources */,
D3EC0C4A1432325A003C162C /* large-image.jpeg in Resources */,
- 5E8A28C81590CB34000D5D2B /* clock@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -354,7 +350,6 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
- COMBINE_HIDPI_IMAGES = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = NS_BUILD_32_LIKE_64;
@@ -375,7 +370,6 @@
buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
- COMBINE_HIDPI_IMAGES = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PREPROCESSOR_DEFINITIONS = NS_BUILD_32_LIKE_64;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
View
16 LICENSE.txt
@@ -10,18 +10,4 @@ Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
-limitations under the License.
-
------------------
-
-Code from the Velvet framework is used in TwUI.
-Velvet is copyright (c) 2012, Bitswift, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
- * Neither the name of the Bitswift, Inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+limitations under the License.
View
37 README.md
@@ -1,4 +1,4 @@
-# TwUI 0.4.0
+# TwUI 0.2.0
TwUI is a hardware accelerated UI framework for Mac, inspired by UIKit. It enables:
@@ -14,35 +14,42 @@ It differs from UIKit in a few ways:
# Setup
-To use the current development version, include all the files in your project and import TUIKit.h. Set your target to link to the ApplicationServices and QuartzCore frameworks.
+To use the current development version, include all the files in your project and import TUIKit.h. Set your target to link to the ApplicationServices and QuartzCore frameworks. Be sure to add NS_BUILD_32_LIKE_64 to your preprocessor flags.
# Usage
-Your `TUIView`-based view hierarchy is hosted inside an `TUINSView`, which is the bridge between AppKit and TwUI. You may set a `TUINSView` as the content view of your window, if you'd like to build your whole UI with TwUI. Or you may opt to have a few smaller `TUINSViews`, using TwUI just where it makes sense and continue to use AppKit everywhere else.
-
-You can also add `NSViews` to a TwUI hierarchy using `TUIViewNSViewContainer`, which bridges back into AppKit from TwUI.
+Your TUIView-based view hierarchy is hosted inside an TUINSView, which is the bridge between AppKit and TwUI. You may set a TUINSView as the content view of your window, if you'd like to build your whole UI with TwUI. Or you may opt to have a few smaller TUINSViews, using TwUI just where it makes sense and continue to use AppKit everywhere else.
# Example Project
-An included example project shows off the basic construction of a pure TwUI-based app. A `TUINSView` is added as the content view of the window, and some `TUIView`-based views are hosted in that. Within the table view cells, some `NSTextFields` are also added using `TUIViewNSViewContainer`. It includes a table view and a tab bar (which is a good example of how you might build your own custom controls).
+An included example project shows off the basic construction of a pure TwUI-based app. A TUINSView is added as the content view of the window, and some TUIView-based views are hosted in that. It includes a table view, and a tab bar (which is a good example of how you might build your own custom controls).
# Status
-TwUI is currently shipping in Twitter for Mac and GitHub for Mac, in use 24/7 by many, many users, and has proven itself very stable.
+TwUI should be considered an alpha project. It is current shipping in Twitter for Mac, in use 24/7 by many, many users and has proven itself very stable. The code still has a few Twitter-for-Mac-isms that should be refactored and cleaned up.
+
+This project follows the [SemVer](http://semver.org/) standard. The API may change in backwards-incompatible ways before the 1.0 release.
+
+The goal of TwUI is to build a high-quality UI framework designed specifically for the Mac. Much inspiration comes from UIKit, but diverging to try new things (i.e. block-based layout and drawRect), and to optimize for Mac-specific interactions is encouraged.
+
+# Known limitations
+
+There are many places where TwUI could be improved:
+
+* Accessibility. It would be great to bridge the AppKit accessibility APIs to something simpler, again, inspired by UIKit.
-This project follows the [SemVer](http://semver.org/) standard. The API may change in backwards-incompatible ways between major releases.
+* Text editing. TUITextEditor is a simple text editor (built on TUITextRenderer). It provides basic editing support and handles a number of standard keybindings. Fleshing this out to be indistinguishable from NSTextView (read: spellchecking, autocorrect) would be useful. If the logic around this were self-contained it would even be great as a standalone project, useful for anyone looking to build a custom text editor for the Mac.
-The goal of TwUI is to build a high-quality UI framework designed specifically for the Mac. Much inspiration comes from UIKit, but diverging to try new things (i.e. block-based layout and drawRect), and optimizing for Mac-specific interactions is encouraged.
+* Reverse-hosting. Right now TUIViews may be hosted inside of an existing NSView hierarchy. It would be useful if the reverse were possible, adding NSViews inside of TUIViews. Doing so in a robust way so event routing, the responder chain, and CAAnimations all just work is a challenge.
-# Contributing
+# Documentation
-We will happily accept pull requests that meet one of the following criteria:
+You can generate documentation with [doxygen](http://www.doxygen.org). Install it, and then run:
- 1. It fixes some functionality that is already in TwUI. This might be a bug, or something not working as expected.
- 2. It's something so basic or important that TwUI really should have it.
- 3. It has to integrate with TwUI internals, and so can't easily be done outside of the framework. This one is the most ambiguous, because interesting things may match this criterion, but still be way out of scope. In some cases, a fork might be more appropriate. Use your best judgment.
+ cd docs
+ doxygen
-# Community
+Documentation is a work in progress, but the API will be familiar if you have used UIKit. (TODO: [appledoc](http://gentlebytes.com/appledoc/) looks very cool, moving to that might be nice).
TwUI has a mailing list, subscribe by sending an email to <twui@librelist.com>.
View
609 TwUI.xcodeproj/project.pbxproj
@@ -7,14 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
- 30D399C9156D8ADD006ECDAE /* TUIProgressBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 30D399C7156D8ADD006ECDAE /* TUIProgressBar.m */; };
- 30D39A0D156D8F71006ECDAE /* TUIProgressBar.h in Headers */ = {isa = PBXBuildFile; fileRef = 30D399C6156D8ADD006ECDAE /* TUIProgressBar.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 48A10E8115B7769A007F9EE3 /* TUILayoutConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A10E7D15B7769A007F9EE3 /* TUILayoutConstraint.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 48A10E8215B7769A007F9EE3 /* TUILayoutConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 48A10E7E15B7769A007F9EE3 /* TUILayoutConstraint.m */; };
- 48A10E8315B7769A007F9EE3 /* TUILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A10E7F15B7769A007F9EE3 /* TUILayoutManager.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 48A10E8415B7769A007F9EE3 /* TUILayoutManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 48A10E8015B7769A007F9EE3 /* TUILayoutManager.m */; };
- 48A10E8915B778E8007F9EE3 /* TUIView+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = 48A10E8715B778E8007F9EE3 /* TUIView+Layout.m */; };
- 48A10E8B15B77A46007F9EE3 /* TUIView+Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A10E8A15B77A46007F9EE3 /* TUIView+Layout.h */; settings = {ATTRIBUTES = (Public, ); }; };
5E6ECEB313BE791600109598 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5EE9839C13BE7650005F430D /* ApplicationServices.framework */; };
5E6ECEB413BE791600109598 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB5E31B613BE6F49004B7899 /* QuartzCore.framework */; };
5E6ECEB613BE791C00109598 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5EE9839C13BE7650005F430D /* ApplicationServices.framework */; };
@@ -28,12 +20,18 @@
5EE983C313BE7834005F430D /* TUIButton+Content.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4413BE6E1900C85CB5 /* TUIButton+Content.m */; };
5EE983C413BE7834005F430D /* TUIButton.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4613BE6E1900C85CB5 /* TUIButton.m */; };
5EE983C513BE7834005F430D /* TUICGAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4813BE6E1900C85CB5 /* TUICGAdditions.m */; };
+ 5EE983C613BE7834005F430D /* TUIColor.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4A13BE6E1900C85CB5 /* TUIColor.m */; };
5EE983C713BE7834005F430D /* TUIControl+TargetAction.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4B13BE6E1900C85CB5 /* TUIControl+TargetAction.m */; };
5EE983C813BE7834005F430D /* TUIControl.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4D13BE6E1900C85CB5 /* TUIControl.m */; };
+ 5EE983C913BE7834005F430D /* TUIFastIndexPath.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4F13BE6E1900C85CB5 /* TUIFastIndexPath.m */; };
+ 5EE983CA13BE7834005F430D /* TUIFont.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5113BE6E1900C85CB5 /* TUIFont.m */; };
5EE983CB13BE7834005F430D /* TUIGeometry.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5313BE6E1900C85CB5 /* TUIGeometry.m */; };
+ 5EE983CC13BE7834005F430D /* TUIImage+Drawing.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5513BE6E1900C85CB5 /* TUIImage+Drawing.m */; };
+ 5EE983CD13BE7834005F430D /* TUIImage.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5713BE6E1900C85CB5 /* TUIImage.m */; };
5EE983CE13BE7834005F430D /* TUIImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5913BE6E1900C85CB5 /* TUIImageView.m */; };
5EE983CF13BE7834005F430D /* TUILabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5D13BE6E1900C85CB5 /* TUILabel.m */; };
5EE983D013BE7834005F430D /* TUINSView+Hyperfocus.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5F13BE6E1900C85CB5 /* TUINSView+Hyperfocus.m */; };
+ 5EE983D113BE7834005F430D /* TUINSView+NSTextInputClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6013BE6E1900C85CB5 /* TUINSView+NSTextInputClient.m */; };
5EE983D213BE7834005F430D /* TUINSView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6213BE6E1900C85CB5 /* TUINSView.m */; };
5EE983D313BE7834005F430D /* TUINSWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6413BE6E1900C85CB5 /* TUINSWindow.m */; };
5EE983D413BE7834005F430D /* TUIResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6613BE6E1900C85CB5 /* TUIResponder.m */; };
@@ -55,6 +53,7 @@
5EE983E413BE7834005F430D /* TUIView+Event.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8413BE6E1900C85CB5 /* TUIView+Event.m */; };
5EE983E513BE7834005F430D /* TUIView+NSTextInputClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8613BE6E1900C85CB5 /* TUIView+NSTextInputClient.m */; };
5EE983E613BE7834005F430D /* TUIView+PasteboardDragging.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8813BE6E1900C85CB5 /* TUIView+PasteboardDragging.m */; };
+ 5EE983E713BE7834005F430D /* TUIView+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8A13BE6E1900C85CB5 /* TUIView+Private.m */; };
5EE983E813BE7834005F430D /* TUIView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8C13BE6E1900C85CB5 /* TUIView.m */; };
5EE983E913BE7834005F430D /* TUIViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8E13BE6E1900C85CB5 /* TUIViewController.m */; };
5EE983EA13BE7834005F430D /* TUIViewNSViewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C9013BE6E1900C85CB5 /* TUIViewNSViewContainer.m */; };
@@ -91,8 +90,6 @@
886EBA8313D64393006DE018 /* TUIControl+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 886EBA7E13D64393006DE018 /* TUIControl+Private.m */; };
886EBA8413D64393006DE018 /* TUIControl+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 886EBA7E13D64393006DE018 /* TUIControl+Private.m */; };
886EBA8513D64393006DE018 /* TUIControl+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = 886EBA7E13D64393006DE018 /* TUIControl+Private.m */; };
- 887C227B15C1C7BB006EC31D /* NSFont+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = 887C227915C1C7BB006EC31D /* NSFont+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 887C227C15C1C7BB006EC31D /* NSFont+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = 887C227A15C1C7BB006EC31D /* NSFont+TUIExtensions.m */; };
887F272C13F9969800D75DE6 /* TUITableViewSectionHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 887F272A13F9969800D75DE6 /* TUITableViewSectionHeader.h */; settings = {ATTRIBUTES = (Public, ); }; };
887F272D13F9969800D75DE6 /* TUITableViewSectionHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 887F272A13F9969800D75DE6 /* TUITableViewSectionHeader.h */; };
887F272E13F9969800D75DE6 /* TUITableViewSectionHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 887F272A13F9969800D75DE6 /* TUITableViewSectionHeader.h */; };
@@ -119,8 +116,6 @@
88D25F5813F5D96500CFAAA9 /* TUITableView+Cell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D25F5413F5D96500CFAAA9 /* TUITableView+Cell.m */; };
88D25F5913F5D96500CFAAA9 /* TUITableView+Cell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D25F5413F5D96500CFAAA9 /* TUITableView+Cell.m */; };
88D25F5A13F5D96500CFAAA9 /* TUITableView+Cell.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D25F5413F5D96500CFAAA9 /* TUITableView+Cell.m */; };
- 88D81CFF1577EF0D009D453B /* TUIStyledView.h in Headers */ = {isa = PBXBuildFile; fileRef = 88D81CFD1577EF0D009D453B /* TUIStyledView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- 88D81D001577EF0D009D453B /* TUIStyledView.m in Sources */ = {isa = PBXBuildFile; fileRef = 88D81CFE1577EF0D009D453B /* TUIStyledView.m */; };
88EFFB5113F417E200CF91A9 /* TUITextViewEditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 88EFFB4F13F417E200CF91A9 /* TUITextViewEditor.h */; };
88EFFB5213F417E200CF91A9 /* TUITextViewEditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 88EFFB4F13F417E200CF91A9 /* TUITextViewEditor.h */; };
88EFFB5313F417E200CF91A9 /* TUITextViewEditor.h in Headers */ = {isa = PBXBuildFile; fileRef = 88EFFB4F13F417E200CF91A9 /* TUITextViewEditor.h */; };
@@ -136,6 +131,7 @@
CB5B266413BE6DA300579B1E /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB5B264F13BE6DA200579B1E /* Cocoa.framework */; };
CB5B266713BE6DA300579B1E /* TwUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB5B264C13BE6DA200579B1E /* TwUI.framework */; };
CB5B266D13BE6DA300579B1E /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = CB5B266B13BE6DA300579B1E /* InfoPlist.strings */; };
+ CB5B266F13BE6DA300579B1E /* TwUITests.h in Resources */ = {isa = PBXBuildFile; fileRef = CB5B266E13BE6DA300579B1E /* TwUITests.h */; };
CB5B267113BE6DA300579B1E /* TwUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = CB5B267013BE6DA300579B1E /* TwUITests.m */; };
CB5E31B713BE6F49004B7899 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB5E31B613BE6F49004B7899 /* QuartzCore.framework */; };
CB5E321D13BE70CA004B7899 /* TUIAccessibility.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C3F13BE6E1900C85CB5 /* TUIAccessibility.m */; };
@@ -144,13 +140,19 @@
CB5E322213BE70CA004B7899 /* TUIButton+Content.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4413BE6E1900C85CB5 /* TUIButton+Content.m */; };
CB5E322413BE70CA004B7899 /* TUIButton.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4613BE6E1900C85CB5 /* TUIButton.m */; };
CB5E322613BE70CA004B7899 /* TUICGAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4813BE6E1900C85CB5 /* TUICGAdditions.m */; };
+ CB5E322813BE70CA004B7899 /* TUIColor.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4A13BE6E1900C85CB5 /* TUIColor.m */; };
CB5E322913BE70CA004B7899 /* TUIControl+TargetAction.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4B13BE6E1900C85CB5 /* TUIControl+TargetAction.m */; };
CB5E322B13BE70CA004B7899 /* TUIControl.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4D13BE6E1900C85CB5 /* TUIControl.m */; };
+ CB5E322D13BE70CA004B7899 /* TUIFastIndexPath.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4F13BE6E1900C85CB5 /* TUIFastIndexPath.m */; };
+ CB5E322F13BE70CA004B7899 /* TUIFont.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5113BE6E1900C85CB5 /* TUIFont.m */; };
CB5E323113BE70CA004B7899 /* TUIGeometry.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5313BE6E1900C85CB5 /* TUIGeometry.m */; };
+ CB5E323313BE70CA004B7899 /* TUIImage+Drawing.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5513BE6E1900C85CB5 /* TUIImage+Drawing.m */; };
+ CB5E323513BE70CA004B7899 /* TUIImage.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5713BE6E1900C85CB5 /* TUIImage.m */; };
CB5E323713BE70CA004B7899 /* TUIImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5913BE6E1900C85CB5 /* TUIImageView.m */; };
CB5E323913BE70CA004B7899 /* TUIKit.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5B13BE6E1900C85CB5 /* TUIKit.m */; };
CB5E323B13BE70CA004B7899 /* TUILabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5D13BE6E1900C85CB5 /* TUILabel.m */; };
CB5E323D13BE70CA004B7899 /* TUINSView+Hyperfocus.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5F13BE6E1900C85CB5 /* TUINSView+Hyperfocus.m */; };
+ CB5E323E13BE70CA004B7899 /* TUINSView+NSTextInputClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6013BE6E1900C85CB5 /* TUINSView+NSTextInputClient.m */; };
CB5E324013BE70CA004B7899 /* TUINSView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6213BE6E1900C85CB5 /* TUINSView.m */; };
CB5E324213BE70CA004B7899 /* TUINSWindow.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6413BE6E1900C85CB5 /* TUINSWindow.m */; };
CB5E324413BE70CA004B7899 /* TUIResponder.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6613BE6E1900C85CB5 /* TUIResponder.m */; };
@@ -172,6 +174,7 @@
CB5E326213BE70CA004B7899 /* TUIView+Event.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8413BE6E1900C85CB5 /* TUIView+Event.m */; };
CB5E326413BE70CA004B7899 /* TUIView+NSTextInputClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8613BE6E1900C85CB5 /* TUIView+NSTextInputClient.m */; };
CB5E326613BE70CA004B7899 /* TUIView+PasteboardDragging.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8813BE6E1900C85CB5 /* TUIView+PasteboardDragging.m */; };
+ CB5E326813BE70CA004B7899 /* TUIView+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8A13BE6E1900C85CB5 /* TUIView+Private.m */; };
CB5E326A13BE70CA004B7899 /* TUIView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8C13BE6E1900C85CB5 /* TUIView.m */; };
CB5E326C13BE70CA004B7899 /* TUIViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8E13BE6E1900C85CB5 /* TUIViewController.m */; };
CB5E326E13BE70CA004B7899 /* TUIViewNSViewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C9013BE6E1900C85CB5 /* TUIViewNSViewContainer.m */; };
@@ -194,11 +197,21 @@
CBB74C9D13BE6E1900C85CB5 /* TUIButton.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4613BE6E1900C85CB5 /* TUIButton.m */; };
CBB74C9E13BE6E1900C85CB5 /* TUICGAdditions.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C4713BE6E1900C85CB5 /* TUICGAdditions.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBB74C9F13BE6E1900C85CB5 /* TUICGAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4813BE6E1900C85CB5 /* TUICGAdditions.m */; };
+ CBB74CA013BE6E1900C85CB5 /* TUIColor.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C4913BE6E1900C85CB5 /* TUIColor.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ CBB74CA113BE6E1900C85CB5 /* TUIColor.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4A13BE6E1900C85CB5 /* TUIColor.m */; };
CBB74CA213BE6E1900C85CB5 /* TUIControl+TargetAction.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4B13BE6E1900C85CB5 /* TUIControl+TargetAction.m */; };
CBB74CA313BE6E1900C85CB5 /* TUIControl.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C4C13BE6E1900C85CB5 /* TUIControl.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBB74CA413BE6E1900C85CB5 /* TUIControl.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4D13BE6E1900C85CB5 /* TUIControl.m */; };
+ CBB74CA513BE6E1900C85CB5 /* TUIFastIndexPath.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C4E13BE6E1900C85CB5 /* TUIFastIndexPath.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ CBB74CA613BE6E1900C85CB5 /* TUIFastIndexPath.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C4F13BE6E1900C85CB5 /* TUIFastIndexPath.m */; };
+ CBB74CA713BE6E1900C85CB5 /* TUIFont.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C5013BE6E1900C85CB5 /* TUIFont.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ CBB74CA813BE6E1900C85CB5 /* TUIFont.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5113BE6E1900C85CB5 /* TUIFont.m */; };
CBB74CA913BE6E1900C85CB5 /* TUIGeometry.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C5213BE6E1900C85CB5 /* TUIGeometry.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBB74CAA13BE6E1900C85CB5 /* TUIGeometry.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5313BE6E1900C85CB5 /* TUIGeometry.m */; };
+ CBB74CAB13BE6E1900C85CB5 /* TUIImage+Drawing.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C5413BE6E1900C85CB5 /* TUIImage+Drawing.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ CBB74CAC13BE6E1900C85CB5 /* TUIImage+Drawing.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5513BE6E1900C85CB5 /* TUIImage+Drawing.m */; };
+ CBB74CAD13BE6E1900C85CB5 /* TUIImage.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C5613BE6E1900C85CB5 /* TUIImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ CBB74CAE13BE6E1900C85CB5 /* TUIImage.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5713BE6E1900C85CB5 /* TUIImage.m */; };
CBB74CAF13BE6E1900C85CB5 /* TUIImageView.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C5813BE6E1900C85CB5 /* TUIImageView.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBB74CB013BE6E1900C85CB5 /* TUIImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5913BE6E1900C85CB5 /* TUIImageView.m */; };
CBB74CB113BE6E1900C85CB5 /* TUIKit.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C5A13BE6E1900C85CB5 /* TUIKit.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -207,6 +220,7 @@
CBB74CB413BE6E1900C85CB5 /* TUILabel.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5D13BE6E1900C85CB5 /* TUILabel.m */; };
CBB74CB513BE6E1900C85CB5 /* TUINSView+Hyperfocus.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C5E13BE6E1900C85CB5 /* TUINSView+Hyperfocus.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBB74CB613BE6E1900C85CB5 /* TUINSView+Hyperfocus.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C5F13BE6E1900C85CB5 /* TUINSView+Hyperfocus.m */; };
+ CBB74CB713BE6E1900C85CB5 /* TUINSView+NSTextInputClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6013BE6E1900C85CB5 /* TUINSView+NSTextInputClient.m */; };
CBB74CB813BE6E1900C85CB5 /* TUINSView.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C6113BE6E1900C85CB5 /* TUINSView.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBB74CB913BE6E1900C85CB5 /* TUINSView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6213BE6E1900C85CB5 /* TUINSView.m */; };
CBB74CBA13BE6E1900C85CB5 /* TUINSWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C6313BE6E1900C85CB5 /* TUINSWindow.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -248,106 +262,13 @@
CBB74CDE13BE6E1900C85CB5 /* TUIView+PasteboardDragging.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C8713BE6E1900C85CB5 /* TUIView+PasteboardDragging.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBB74CDF13BE6E1900C85CB5 /* TUIView+PasteboardDragging.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8813BE6E1900C85CB5 /* TUIView+PasteboardDragging.m */; };
CBB74CE013BE6E1900C85CB5 /* TUIView+Private.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C8913BE6E1900C85CB5 /* TUIView+Private.h */; settings = {ATTRIBUTES = (Public, ); }; };
+ CBB74CE113BE6E1900C85CB5 /* TUIView+Private.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8A13BE6E1900C85CB5 /* TUIView+Private.m */; };
CBB74CE213BE6E1900C85CB5 /* TUIView.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C8B13BE6E1900C85CB5 /* TUIView.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBB74CE313BE6E1900C85CB5 /* TUIView.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8C13BE6E1900C85CB5 /* TUIView.m */; };
CBB74CE413BE6E1900C85CB5 /* TUIViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C8D13BE6E1900C85CB5 /* TUIViewController.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBB74CE513BE6E1900C85CB5 /* TUIViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C8E13BE6E1900C85CB5 /* TUIViewController.m */; };
CBB74CE613BE6E1900C85CB5 /* TUIViewNSViewContainer.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C8F13BE6E1900C85CB5 /* TUIViewNSViewContainer.h */; settings = {ATTRIBUTES = (Public, ); }; };
CBB74CE713BE6E1900C85CB5 /* TUIViewNSViewContainer.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C9013BE6E1900C85CB5 /* TUIViewNSViewContainer.m */; };
- D039723F15B7D7CB0092CD26 /* TUILayoutConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 48A10E7E15B7769A007F9EE3 /* TUILayoutConstraint.m */; };
- D039724115B7D7CC0092CD26 /* TUILayoutConstraint.m in Sources */ = {isa = PBXBuildFile; fileRef = 48A10E7E15B7769A007F9EE3 /* TUILayoutConstraint.m */; };
- D039724215B7D7CE0092CD26 /* TUILayoutManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 48A10E8015B7769A007F9EE3 /* TUILayoutManager.m */; };
- D039724315B7D7CE0092CD26 /* TUILayoutManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 48A10E8015B7769A007F9EE3 /* TUILayoutManager.m */; };
- D039724415B7D7D40092CD26 /* TUIView+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = 48A10E8715B778E8007F9EE3 /* TUIView+Layout.m */; };
- D039724515B7D7D40092CD26 /* TUIView+Layout.m in Sources */ = {isa = PBXBuildFile; fileRef = 48A10E8715B778E8007F9EE3 /* TUIView+Layout.m */; };
- D039724615B7D7D60092CD26 /* TUIView+Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A10E8A15B77A46007F9EE3 /* TUIView+Layout.h */; };
- D039724715B7D7D70092CD26 /* TUIView+Layout.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A10E8A15B77A46007F9EE3 /* TUIView+Layout.h */; };
- D039724815B7D7DB0092CD26 /* TUILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A10E7F15B7769A007F9EE3 /* TUILayoutManager.h */; };
- D039724915B7D7DC0092CD26 /* TUILayoutManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A10E7F15B7769A007F9EE3 /* TUILayoutManager.h */; };
- D039724A15B7D7DE0092CD26 /* TUILayoutConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A10E7D15B7769A007F9EE3 /* TUILayoutConstraint.h */; };
- D039724B15B7D7DE0092CD26 /* TUILayoutConstraint.h in Headers */ = {isa = PBXBuildFile; fileRef = 48A10E7D15B7769A007F9EE3 /* TUILayoutConstraint.h */; };
- D04007EB15BF2BC000FD49DB /* libExpecta.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D04007CD15BF2BB000FD49DB /* libExpecta.a */; };
- D04007EC15BF2BC000FD49DB /* libSpecta.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D04007E015BF2BB300FD49DB /* libSpecta.a */; };
- D040611615B6A7CD00F753ED /* NSTextView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D040611215B6A7CC00F753ED /* NSTextView+TUIExtensions.m */; };
- D040611715B6A7CD00F753ED /* NSTextView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D040611215B6A7CC00F753ED /* NSTextView+TUIExtensions.m */; };
- D040611815B6A7CD00F753ED /* NSTextView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D040611215B6A7CC00F753ED /* NSTextView+TUIExtensions.m */; };
- D05D23A015BF7239000ED14F /* NSImage+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D05D239E15BF7239000ED14F /* NSImage+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D05D23A115BF7239000ED14F /* NSImage+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D05D239E15BF7239000ED14F /* NSImage+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D05D23A215BF7239000ED14F /* NSImage+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D05D239E15BF7239000ED14F /* NSImage+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D05D23A315BF7239000ED14F /* NSImage+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D05D239F15BF7239000ED14F /* NSImage+TUIExtensions.m */; };
- D05D23A415BF7239000ED14F /* NSImage+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D05D239F15BF7239000ED14F /* NSImage+TUIExtensions.m */; };
- D05D23A515BF7239000ED14F /* NSImage+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D05D239F15BF7239000ED14F /* NSImage+TUIExtensions.m */; };
- D05DEE8C15BF645D005D8769 /* TUIStretchableImage.h in Headers */ = {isa = PBXBuildFile; fileRef = D05DEE8A15BF645D005D8769 /* TUIStretchableImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D05DEE8D15BF645D005D8769 /* TUIStretchableImage.h in Headers */ = {isa = PBXBuildFile; fileRef = D05DEE8A15BF645D005D8769 /* TUIStretchableImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D05DEE8E15BF645D005D8769 /* TUIStretchableImage.h in Headers */ = {isa = PBXBuildFile; fileRef = D05DEE8A15BF645D005D8769 /* TUIStretchableImage.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D05DEE8F15BF645D005D8769 /* TUIStretchableImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D05DEE8B15BF645D005D8769 /* TUIStretchableImage.m */; };
- D05DEE9015BF645D005D8769 /* TUIStretchableImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D05DEE8B15BF645D005D8769 /* TUIStretchableImage.m */; };
- D05DEE9115BF645D005D8769 /* TUIStretchableImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D05DEE8B15BF645D005D8769 /* TUIStretchableImage.m */; };
- D07AA82315BDD6B600F736C0 /* TUINSView+Hyperfocus.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C5E13BE6E1900C85CB5 /* TUINSView+Hyperfocus.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D07AA82415BDD6B700F736C0 /* TUINSView+Hyperfocus.h in Headers */ = {isa = PBXBuildFile; fileRef = CBB74C5E13BE6E1900C85CB5 /* TUINSView+Hyperfocus.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D07AA82615BDD72F00F736C0 /* TUINSView+NSTextInputClient.h in Headers */ = {isa = PBXBuildFile; fileRef = D07AA82515BDD72D00F736C0 /* TUINSView+NSTextInputClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D07AA82715BDD72F00F736C0 /* TUINSView+NSTextInputClient.h in Headers */ = {isa = PBXBuildFile; fileRef = D07AA82515BDD72D00F736C0 /* TUINSView+NSTextInputClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D07AA82815BDD72F00F736C0 /* TUINSView+NSTextInputClient.h in Headers */ = {isa = PBXBuildFile; fileRef = D07AA82515BDD72D00F736C0 /* TUINSView+NSTextInputClient.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D07AA82915BDD79900F736C0 /* TUINSView+NSTextInputClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6013BE6E1900C85CB5 /* TUINSView+NSTextInputClient.m */; };
- D07AA82A15BDD79A00F736C0 /* TUINSView+NSTextInputClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6013BE6E1900C85CB5 /* TUINSView+NSTextInputClient.m */; };
- D07AA82B15BDD79A00F736C0 /* TUINSView+NSTextInputClient.m in Sources */ = {isa = PBXBuildFile; fileRef = CBB74C6013BE6E1900C85CB5 /* TUINSView+NSTextInputClient.m */; };
- D0C764EB15B611C200E7AC2C /* TUIBridgedView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C764EA15B611C200E7AC2C /* TUIBridgedView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C764EC15B611C200E7AC2C /* TUIBridgedView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C764EA15B611C200E7AC2C /* TUIBridgedView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C764ED15B611C200E7AC2C /* TUIBridgedView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C764EA15B611C200E7AC2C /* TUIBridgedView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7650515B6156A00E7AC2C /* TUIHostView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7650415B6156A00E7AC2C /* TUIHostView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7650615B6156A00E7AC2C /* TUIHostView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7650415B6156A00E7AC2C /* TUIHostView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7650715B6156A00E7AC2C /* TUIHostView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7650415B6156A00E7AC2C /* TUIHostView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7651115B6189D00E7AC2C /* TUINSHostView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7650D15B6189D00E7AC2C /* TUINSHostView.m */; };
- D0C7651215B6189D00E7AC2C /* TUINSHostView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7650D15B6189D00E7AC2C /* TUINSHostView.m */; };
- D0C7651315B6189D00E7AC2C /* TUINSHostView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7650D15B6189D00E7AC2C /* TUINSHostView.m */; };
- D0C7651615B61E5A00E7AC2C /* TUIBridgedScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7651515B61E5900E7AC2C /* TUIBridgedScrollView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7651715B61E5A00E7AC2C /* TUIBridgedScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7651515B61E5900E7AC2C /* TUIBridgedScrollView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7651815B61E5A00E7AC2C /* TUIBridgedScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7651515B61E5900E7AC2C /* TUIBridgedScrollView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7652715B6232100E7AC2C /* CALayer+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7652115B6232100E7AC2C /* CALayer+TUIExtensions.m */; };
- D0C7652815B6232100E7AC2C /* CALayer+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7652115B6232100E7AC2C /* CALayer+TUIExtensions.m */; };
- D0C7652915B6232100E7AC2C /* CALayer+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7652115B6232100E7AC2C /* CALayer+TUIExtensions.m */; };
- D0C7652D15B6232100E7AC2C /* CATransaction+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7652315B6232100E7AC2C /* CATransaction+TUIExtensions.m */; };
- D0C7652E15B6232100E7AC2C /* CATransaction+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7652315B6232100E7AC2C /* CATransaction+TUIExtensions.m */; };
- D0C7652F15B6232100E7AC2C /* CATransaction+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7652315B6232100E7AC2C /* CATransaction+TUIExtensions.m */; };
- D0C7653315B624D900E7AC2C /* NSView+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7653115B624D800E7AC2C /* NSView+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7653415B624D900E7AC2C /* NSView+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7653115B624D800E7AC2C /* NSView+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7653515B624D900E7AC2C /* NSView+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7653115B624D800E7AC2C /* NSView+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7653615B624D900E7AC2C /* NSView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7653215B624D800E7AC2C /* NSView+TUIExtensions.m */; };
- D0C7653715B624D900E7AC2C /* NSView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7653215B624D800E7AC2C /* NSView+TUIExtensions.m */; };
- D0C7653815B624D900E7AC2C /* NSView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7653215B624D800E7AC2C /* NSView+TUIExtensions.m */; };
- D0C7654615B626E200E7AC2C /* TUIView+TUIBridgedView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7653E15B626E200E7AC2C /* TUIView+TUIBridgedView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7654715B626E200E7AC2C /* TUIView+TUIBridgedView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7653E15B626E200E7AC2C /* TUIView+TUIBridgedView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7654815B626E200E7AC2C /* TUIView+TUIBridgedView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7653E15B626E200E7AC2C /* TUIView+TUIBridgedView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7654915B626E200E7AC2C /* TUIView+TUIBridgedView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7653F15B626E200E7AC2C /* TUIView+TUIBridgedView.m */; };
- D0C7654A15B626E200E7AC2C /* TUIView+TUIBridgedView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7653F15B626E200E7AC2C /* TUIView+TUIBridgedView.m */; };
- D0C7654B15B626E200E7AC2C /* TUIView+TUIBridgedView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7653F15B626E200E7AC2C /* TUIView+TUIBridgedView.m */; };
- D0C7655215B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7655015B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7655315B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7655015B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7655415B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7655015B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7655515B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7655115B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.m */; };
- D0C7655615B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7655115B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.m */; };
- D0C7655715B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7655115B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.m */; };
- D0C7655D15B6297300E7AC2C /* NSClipView+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7655915B6297200E7AC2C /* NSClipView+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7655E15B6297300E7AC2C /* NSClipView+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7655915B6297200E7AC2C /* NSClipView+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7655F15B6297300E7AC2C /* NSClipView+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7655915B6297200E7AC2C /* NSClipView+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7656015B6297300E7AC2C /* NSClipView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7655A15B6297200E7AC2C /* NSClipView+TUIExtensions.m */; };
- D0C7656115B6297300E7AC2C /* NSClipView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7655A15B6297200E7AC2C /* NSClipView+TUIExtensions.m */; };
- D0C7656215B6297300E7AC2C /* NSClipView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7655A15B6297200E7AC2C /* NSClipView+TUIExtensions.m */; };
- D0C7656315B6297300E7AC2C /* NSScrollView+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7655B15B6297300E7AC2C /* NSScrollView+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7656415B6297300E7AC2C /* NSScrollView+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7655B15B6297300E7AC2C /* NSScrollView+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7656515B6297300E7AC2C /* NSScrollView+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0C7655B15B6297300E7AC2C /* NSScrollView+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0C7656615B6297300E7AC2C /* NSScrollView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7655C15B6297300E7AC2C /* NSScrollView+TUIExtensions.m */; };
- D0C7656715B6297300E7AC2C /* NSScrollView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7655C15B6297300E7AC2C /* NSScrollView+TUIExtensions.m */; };
- D0C7656815B6297300E7AC2C /* NSScrollView+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7655C15B6297300E7AC2C /* NSScrollView+TUIExtensions.m */; };
- D0C7657415B6341800E7AC2C /* TUICAAction.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7657015B6341800E7AC2C /* TUICAAction.m */; };
- D0C7657515B6341800E7AC2C /* TUICAAction.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7657015B6341800E7AC2C /* TUICAAction.m */; };
- D0C7657615B6341800E7AC2C /* TUICAAction.m in Sources */ = {isa = PBXBuildFile; fileRef = D0C7657015B6341800E7AC2C /* TUICAAction.m */; };
- D0EA12F115C34FEA00FAA603 /* NSColor+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0EA12EF15C34FEA00FAA603 /* NSColor+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0EA12F215C34FEA00FAA603 /* NSColor+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0EA12EF15C34FEA00FAA603 /* NSColor+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0EA12F315C34FEA00FAA603 /* NSColor+TUIExtensions.h in Headers */ = {isa = PBXBuildFile; fileRef = D0EA12EF15C34FEA00FAA603 /* NSColor+TUIExtensions.h */; settings = {ATTRIBUTES = (Public, ); }; };
- D0EA12F415C34FEA00FAA603 /* NSColor+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0EA12F015C34FEA00FAA603 /* NSColor+TUIExtensions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- D0EA12F515C34FEA00FAA603 /* NSColor+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0EA12F015C34FEA00FAA603 /* NSColor+TUIExtensions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
- D0EA12F615C34FEA00FAA603 /* NSColor+TUIExtensions.m in Sources */ = {isa = PBXBuildFile; fileRef = D0EA12F015C34FEA00FAA603 /* NSColor+TUIExtensions.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -358,87 +279,9 @@
remoteGlobalIDString = CB5B264B13BE6DA200579B1E;
remoteInfo = TwUI;
};
- D04007CC15BF2BB000FD49DB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = D04007C215BF2BAF00FD49DB /* Expecta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E9ACDF0C13B2DD520010F4D7;
- remoteInfo = Expecta;
- };
- D04007CE15BF2BB000FD49DB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = D04007C215BF2BAF00FD49DB /* Expecta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E93067CE13B2E6D100EA26FF;
- remoteInfo = "Expecta-iOS";
- };
- D04007D015BF2BB000FD49DB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = D04007C215BF2BAF00FD49DB /* Expecta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E9ACDF1D13B2DD520010F4D7;
- remoteInfo = ExpectaTests;
- };
- D04007D215BF2BB000FD49DB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = D04007C215BF2BAF00FD49DB /* Expecta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E93067DA13B2E6D100EA26FF;
- remoteInfo = "Expecta-iOSTests";
- };
- D04007DF15BF2BB300FD49DB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = D04007D515BF2BB300FD49DB /* Specta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E9D96A2614B6B8AB007D9521;
- remoteInfo = Specta;
- };
- D04007E115BF2BB300FD49DB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = D04007D515BF2BB300FD49DB /* Specta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E9B777A414BA294B00D8DC76;
- remoteInfo = "Specta-iOS";
- };
- D04007E315BF2BB300FD49DB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = D04007D515BF2BB300FD49DB /* Specta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E9D96A3A14B6B8AB007D9521;
- remoteInfo = SpectaTests;
- };
- D04007E515BF2BB300FD49DB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = D04007D515BF2BB300FD49DB /* Specta.xcodeproj */;
- proxyType = 2;
- remoteGlobalIDString = E9B777B314BA294C00D8DC76;
- remoteInfo = "Specta-iOSTests";
- };
- D04007E715BF2BBC00FD49DB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = D04007C215BF2BAF00FD49DB /* Expecta.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = E9ACDF0B13B2DD520010F4D7;
- remoteInfo = Expecta;
- };
- D04007E915BF2BBC00FD49DB /* PBXContainerItemProxy */ = {
- isa = PBXContainerItemProxy;
- containerPortal = D04007D515BF2BB300FD49DB /* Specta.xcodeproj */;
- proxyType = 1;
- remoteGlobalIDString = E9D96A2514B6B8AB007D9521;
- remoteInfo = Specta;
- };
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
- 30D399C6156D8ADD006ECDAE /* TUIProgressBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIProgressBar.h; sourceTree = "<group>"; };
- 30D399C7156D8ADD006ECDAE /* TUIProgressBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIProgressBar.m; sourceTree = "<group>"; };
- 48A10E7D15B7769A007F9EE3 /* TUILayoutConstraint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUILayoutConstraint.h; sourceTree = "<group>"; };
- 48A10E7E15B7769A007F9EE3 /* TUILayoutConstraint.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUILayoutConstraint.m; sourceTree = "<group>"; };
- 48A10E7F15B7769A007F9EE3 /* TUILayoutManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUILayoutManager.h; sourceTree = "<group>"; };
- 48A10E8015B7769A007F9EE3 /* TUILayoutManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUILayoutManager.m; sourceTree = "<group>"; };
- 48A10E8715B778E8007F9EE3 /* TUIView+Layout.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TUIView+Layout.m"; sourceTree = "<group>"; };
- 48A10E8A15B77A46007F9EE3 /* TUIView+Layout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUIView+Layout.h"; sourceTree = "<group>"; };
5EE9839C13BE7650005F430D /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = System/Library/Frameworks/ApplicationServices.framework; sourceTree = SDKROOT; };
5EE983B713BE7809005F430D /* libtwui.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libtwui.a; sourceTree = BUILT_PRODUCTS_DIR; };
8819794213E26E0200AA39EB /* TUIView+Accessibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUIView+Accessibility.h"; sourceTree = "<group>"; };
@@ -451,8 +294,6 @@
884E8F5A1538809C000F7A8D /* CAAnimation+TUIExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CAAnimation+TUIExtensions.m"; sourceTree = "<group>"; };
886EBA7D13D64393006DE018 /* TUIControl+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUIControl+Private.h"; sourceTree = "<group>"; };
886EBA7E13D64393006DE018 /* TUIControl+Private.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TUIControl+Private.m"; sourceTree = "<group>"; };
- 887C227915C1C7BB006EC31D /* NSFont+TUIExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSFont+TUIExtensions.h"; sourceTree = "<group>"; };
- 887C227A15C1C7BB006EC31D /* NSFont+TUIExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSFont+TUIExtensions.m"; sourceTree = "<group>"; };
887F272A13F9969800D75DE6 /* TUITableViewSectionHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUITableViewSectionHeader.h; sourceTree = "<group>"; };
887F272B13F9969800D75DE6 /* TUITableViewSectionHeader.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUITableViewSectionHeader.m; sourceTree = "<group>"; };
88A4AFDC145A16C90071CF22 /* TUITextRenderer+Accessibility.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUITextRenderer+Accessibility.h"; sourceTree = "<group>"; };
@@ -463,8 +304,6 @@
88CC1F3613E3684600827793 /* TUIButton+Accessibility.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TUIButton+Accessibility.m"; sourceTree = "<group>"; };
88D25F5313F5D96500CFAAA9 /* TUITableView+Cell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUITableView+Cell.h"; sourceTree = "<group>"; };
88D25F5413F5D96500CFAAA9 /* TUITableView+Cell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TUITableView+Cell.m"; sourceTree = "<group>"; };
- 88D81CFD1577EF0D009D453B /* TUIStyledView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIStyledView.h; sourceTree = "<group>"; };
- 88D81CFE1577EF0D009D453B /* TUIStyledView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIStyledView.m; sourceTree = "<group>"; };
88EFFB4F13F417E200CF91A9 /* TUITextViewEditor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUITextViewEditor.h; sourceTree = "<group>"; };
88EFFB5013F417E200CF91A9 /* TUITextViewEditor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUITextViewEditor.m; sourceTree = "<group>"; };
C09019E015D0D5C10088A39C /* TUINSImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUINSImage.h; sourceTree = "<group>"; };
@@ -481,6 +320,7 @@
CB5B266213BE6DA300579B1E /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
CB5B266A13BE6DA300579B1E /* TwUITests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "TwUITests-Info.plist"; sourceTree = "<group>"; };
CB5B266C13BE6DA300579B1E /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+ CB5B266E13BE6DA300579B1E /* TwUITests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = TwUITests.h; sourceTree = "<group>"; };
CB5B267013BE6DA300579B1E /* TwUITests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = TwUITests.m; sourceTree = "<group>"; };
CB5E31B613BE6F49004B7899 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
CB5E321813BE7098004B7899 /* libtwui.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libtwui.dylib; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -499,11 +339,21 @@
CBB74C4613BE6E1900C85CB5 /* TUIButton.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIButton.m; sourceTree = "<group>"; };
CBB74C4713BE6E1900C85CB5 /* TUICGAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUICGAdditions.h; sourceTree = "<group>"; };
CBB74C4813BE6E1900C85CB5 /* TUICGAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUICGAdditions.m; sourceTree = "<group>"; };
+ CBB74C4913BE6E1900C85CB5 /* TUIColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIColor.h; sourceTree = "<group>"; };
+ CBB74C4A13BE6E1900C85CB5 /* TUIColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIColor.m; sourceTree = "<group>"; };
CBB74C4B13BE6E1900C85CB5 /* TUIControl+TargetAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TUIControl+TargetAction.m"; sourceTree = "<group>"; };
CBB74C4C13BE6E1900C85CB5 /* TUIControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIControl.h; sourceTree = "<group>"; };
CBB74C4D13BE6E1900C85CB5 /* TUIControl.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIControl.m; sourceTree = "<group>"; };
+ CBB74C4E13BE6E1900C85CB5 /* TUIFastIndexPath.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIFastIndexPath.h; sourceTree = "<group>"; };
+ CBB74C4F13BE6E1900C85CB5 /* TUIFastIndexPath.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIFastIndexPath.m; sourceTree = "<group>"; };
+ CBB74C5013BE6E1900C85CB5 /* TUIFont.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIFont.h; sourceTree = "<group>"; };
+ CBB74C5113BE6E1900C85CB5 /* TUIFont.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIFont.m; sourceTree = "<group>"; };
CBB74C5213BE6E1900C85CB5 /* TUIGeometry.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIGeometry.h; sourceTree = "<group>"; };
CBB74C5313BE6E1900C85CB5 /* TUIGeometry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIGeometry.m; sourceTree = "<group>"; };
+ CBB74C5413BE6E1900C85CB5 /* TUIImage+Drawing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUIImage+Drawing.h"; sourceTree = "<group>"; };
+ CBB74C5513BE6E1900C85CB5 /* TUIImage+Drawing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TUIImage+Drawing.m"; sourceTree = "<group>"; };
+ CBB74C5613BE6E1900C85CB5 /* TUIImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIImage.h; sourceTree = "<group>"; };
+ CBB74C5713BE6E1900C85CB5 /* TUIImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIImage.m; sourceTree = "<group>"; };
CBB74C5813BE6E1900C85CB5 /* TUIImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIImageView.h; sourceTree = "<group>"; };
CBB74C5913BE6E1900C85CB5 /* TUIImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIImageView.m; sourceTree = "<group>"; };
CBB74C5A13BE6E1900C85CB5 /* TUIKit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TUIKit.h; path = lib/UIKit/TUIKit.h; sourceTree = "<group>"; };
@@ -554,47 +404,13 @@
CBB74C8713BE6E1900C85CB5 /* TUIView+PasteboardDragging.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUIView+PasteboardDragging.h"; sourceTree = "<group>"; };
CBB74C8813BE6E1900C85CB5 /* TUIView+PasteboardDragging.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TUIView+PasteboardDragging.m"; sourceTree = "<group>"; };
CBB74C8913BE6E1900C85CB5 /* TUIView+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUIView+Private.h"; sourceTree = "<group>"; };
+ CBB74C8A13BE6E1900C85CB5 /* TUIView+Private.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TUIView+Private.m"; sourceTree = "<group>"; };
CBB74C8B13BE6E1900C85CB5 /* TUIView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIView.h; sourceTree = "<group>"; };
CBB74C8C13BE6E1900C85CB5 /* TUIView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIView.m; sourceTree = "<group>"; };
CBB74C8D13BE6E1900C85CB5 /* TUIViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIViewController.h; sourceTree = "<group>"; };
CBB74C8E13BE6E1900C85CB5 /* TUIViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIViewController.m; sourceTree = "<group>"; };
CBB74C8F13BE6E1900C85CB5 /* TUIViewNSViewContainer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIViewNSViewContainer.h; sourceTree = "<group>"; };
CBB74C9013BE6E1900C85CB5 /* TUIViewNSViewContainer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIViewNSViewContainer.m; sourceTree = "<group>"; };
- D04007C215BF2BAF00FD49DB /* Expecta.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Expecta.xcodeproj; path = expecta/Expecta.xcodeproj; sourceTree = "<group>"; };
- D04007D515BF2BB300FD49DB /* Specta.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Specta.xcodeproj; path = specta/Specta.xcodeproj; sourceTree = "<group>"; };
- D04007ED15BF2C0700FD49DB /* TwUITests-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TwUITests-Prefix.pch"; sourceTree = "<group>"; };
- D040611115B6A7CC00F753ED /* NSTextView+TUIExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSTextView+TUIExtensions.h"; sourceTree = "<group>"; };
- D040611215B6A7CC00F753ED /* NSTextView+TUIExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSTextView+TUIExtensions.m"; sourceTree = "<group>"; };
- D05D239E15BF7239000ED14F /* NSImage+TUIExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSImage+TUIExtensions.h"; sourceTree = "<group>"; };
- D05D239F15BF7239000ED14F /* NSImage+TUIExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSImage+TUIExtensions.m"; sourceTree = "<group>"; };
- D05DEE8A15BF645D005D8769 /* TUIStretchableImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIStretchableImage.h; sourceTree = "<group>"; };
- D05DEE8B15BF645D005D8769 /* TUIStretchableImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIStretchableImage.m; sourceTree = "<group>"; };
- D07AA82515BDD72D00F736C0 /* TUINSView+NSTextInputClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUINSView+NSTextInputClient.h"; sourceTree = "<group>"; };
- D0C764EA15B611C200E7AC2C /* TUIBridgedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIBridgedView.h; sourceTree = "<group>"; };
- D0C7650415B6156A00E7AC2C /* TUIHostView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIHostView.h; sourceTree = "<group>"; };
- D0C7650C15B6189D00E7AC2C /* TUINSHostView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUINSHostView.h; sourceTree = "<group>"; };
- D0C7650D15B6189D00E7AC2C /* TUINSHostView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUINSHostView.m; sourceTree = "<group>"; };
- D0C7651515B61E5900E7AC2C /* TUIBridgedScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUIBridgedScrollView.h; sourceTree = "<group>"; };
- D0C7652015B6232100E7AC2C /* CALayer+TUIExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CALayer+TUIExtensions.h"; sourceTree = "<group>"; };
- D0C7652115B6232100E7AC2C /* CALayer+TUIExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CALayer+TUIExtensions.m"; sourceTree = "<group>"; };
- D0C7652215B6232100E7AC2C /* CATransaction+TUIExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "CATransaction+TUIExtensions.h"; sourceTree = "<group>"; };
- D0C7652315B6232100E7AC2C /* CATransaction+TUIExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "CATransaction+TUIExtensions.m"; sourceTree = "<group>"; };
- D0C7653115B624D800E7AC2C /* NSView+TUIExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSView+TUIExtensions.h"; sourceTree = "<group>"; };
- D0C7653215B624D800E7AC2C /* NSView+TUIExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSView+TUIExtensions.m"; sourceTree = "<group>"; };
- D0C7653E15B626E200E7AC2C /* TUIView+TUIBridgedView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUIView+TUIBridgedView.h"; sourceTree = "<group>"; };
- D0C7653F15B626E200E7AC2C /* TUIView+TUIBridgedView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TUIView+TUIBridgedView.m"; sourceTree = "<group>"; };
- D0C7655015B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "TUIScrollView+TUIBridgedScrollView.h"; sourceTree = "<group>"; };
- D0C7655115B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "TUIScrollView+TUIBridgedScrollView.m"; sourceTree = "<group>"; };
- D0C7655915B6297200E7AC2C /* NSClipView+TUIExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSClipView+TUIExtensions.h"; sourceTree = "<group>"; };
- D0C7655A15B6297200E7AC2C /* NSClipView+TUIExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSClipView+TUIExtensions.m"; sourceTree = "<group>"; };
- D0C7655B15B6297300E7AC2C /* NSScrollView+TUIExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSScrollView+TUIExtensions.h"; sourceTree = "<group>"; };
- D0C7655C15B6297300E7AC2C /* NSScrollView+TUIExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSScrollView+TUIExtensions.m"; sourceTree = "<group>"; };
- D0C7656915B62EFA00E7AC2C /* TUINSView+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TUINSView+Private.h"; sourceTree = "<group>"; };
- D0C7656D15B6322A00E7AC2C /* TUIViewNSViewContainer+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "TUIViewNSViewContainer+Private.h"; sourceTree = "<group>"; };
- D0C7656F15B6341800E7AC2C /* TUICAAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TUICAAction.h; sourceTree = "<group>"; };
- D0C7657015B6341800E7AC2C /* TUICAAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUICAAction.m; sourceTree = "<group>"; };
- D0EA12EF15C34FEA00FAA603 /* NSColor+TUIExtensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSColor+TUIExtensions.h"; sourceTree = "<group>"; };
- D0EA12F015C34FEA00FAA603 /* NSColor+TUIExtensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSColor+TUIExtensions.m"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -622,8 +438,6 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
- D04007EB15BF2BC000FD49DB /* libExpecta.a in Frameworks */,
- D04007EC15BF2BC000FD49DB /* libSpecta.a in Frameworks */,
CB5B266313BE6DA300579B1E /* SenTestingKit.framework in Frameworks */,
CB5B266413BE6DA300579B1E /* Cocoa.framework in Frameworks */,
CB5B266713BE6DA300579B1E /* TwUI.framework in Frameworks */,
@@ -708,8 +522,7 @@
CB5B266813BE6DA300579B1E /* TwUITests */ = {
isa = PBXGroup;
children = (
- D04007C215BF2BAF00FD49DB /* Expecta.xcodeproj */,
- D04007D515BF2BB300FD49DB /* Specta.xcodeproj */,
+ CB5B266E13BE6DA300579B1E /* TwUITests.h */,
CB5B267013BE6DA300579B1E /* TwUITests.m */,
CB5B266913BE6DA300579B1E /* Supporting Files */,
);
@@ -721,7 +534,6 @@
children = (
CB5B266A13BE6DA300579B1E /* TwUITests-Info.plist */,
CB5B266B13BE6DA300579B1E /* InfoPlist.strings */,
- D04007ED15BF2C0700FD49DB /* TwUITests-Prefix.pch */,
);
name = "Supporting Files";
sourceTree = "<group>";
@@ -741,20 +553,10 @@
children = (
CBB74C3913BE6E1900C85CB5 /* ABActiveRange.h */,
CBB74C3A13BE6E1900C85CB5 /* ABActiveRange.m */,
- 884E8F591538809C000F7A8D /* CAAnimation+TUIExtensions.h */,
- 884E8F5A1538809C000F7A8D /* CAAnimation+TUIExtensions.m */,
- D0C7652015B6232100E7AC2C /* CALayer+TUIExtensions.h */,
- D0C7652115B6232100E7AC2C /* CALayer+TUIExtensions.m */,
- D0C7652215B6232100E7AC2C /* CATransaction+TUIExtensions.h */,
- D0C7652315B6232100E7AC2C /* CATransaction+TUIExtensions.m */,
CBB74C3B13BE6E1900C85CB5 /* CoreText+Additions.h */,
CBB74C3C13BE6E1900C85CB5 /* CoreText+Additions.m */,
- 887C227915C1C7BB006EC31D /* NSFont+TUIExtensions.h */,
- 887C227A15C1C7BB006EC31D /* NSFont+TUIExtensions.m */,
- D040611115B6A7CC00F753ED /* NSTextView+TUIExtensions.h */,
- D040611215B6A7CC00F753ED /* NSTextView+TUIExtensions.m */,
- D0C7656F15B6341800E7AC2C /* TUICAAction.h */,
- D0C7657015B6341800E7AC2C /* TUICAAction.m */,
+ 884E8F591538809C000F7A8D /* CAAnimation+TUIExtensions.h */,
+ 884E8F5A1538809C000F7A8D /* CAAnimation+TUIExtensions.m */,
);
name = Support;
path = lib/Support;
@@ -763,24 +565,13 @@
CBB74C3D13BE6E1900C85CB5 /* UIKit */ = {
isa = PBXGroup;
children = (
- D0C7655915B6297200E7AC2C /* NSClipView+TUIExtensions.h */,
- D0C7655A15B6297200E7AC2C /* NSClipView+TUIExtensions.m */,
- D0EA12EF15C34FEA00FAA603 /* NSColor+TUIExtensions.h */,
- D0EA12F015C34FEA00FAA603 /* NSColor+TUIExtensions.m */,
- D05D239E15BF7239000ED14F /* NSImage+TUIExtensions.h */,
- D05D239F15BF7239000ED14F /* NSImage+TUIExtensions.m */,
- D0C7655B15B6297300E7AC2C /* NSScrollView+TUIExtensions.h */,
- D0C7655C15B6297300E7AC2C /* NSScrollView+TUIExtensions.m */,
- D0C7653115B624D800E7AC2C /* NSView+TUIExtensions.h */,
- D0C7653215B624D800E7AC2C /* NSView+TUIExtensions.m */,
+ CBB74C5B13BE6E1900C85CB5 /* TUIKit.m */,
CBB74C3E13BE6E1900C85CB5 /* TUIAccessibility.h */,
CBB74C3F13BE6E1900C85CB5 /* TUIAccessibility.m */,
CBB74C4013BE6E1900C85CB5 /* TUIActivityIndicatorView.h */,
CBB74C4113BE6E1900C85CB5 /* TUIActivityIndicatorView.m */,
CBB74C4213BE6E1900C85CB5 /* TUIAttributedString.h */,
CBB74C4313BE6E1900C85CB5 /* TUIAttributedString.m */,
- D0C7651515B61E5900E7AC2C /* TUIBridgedScrollView.h */,
- D0C764EA15B611C200E7AC2C /* TUIBridgedView.h */,
88CC1F3513E3684400827793 /* TUIButton+Accessibility.h */,
88CC1F3613E3684600827793 /* TUIButton+Accessibility.m */,
CBB74C4413BE6E1900C85CB5 /* TUIButton+Content.m */,
@@ -788,79 +579,71 @@
CBB74C4613BE6E1900C85CB5 /* TUIButton.m */,
CBB74C4713BE6E1900C85CB5 /* TUICGAdditions.h */,
CBB74C4813BE6E1900C85CB5 /* TUICGAdditions.m */,
+ CBB74C4913BE6E1900C85CB5 /* TUIColor.h */,
+ CBB74C4A13BE6E1900C85CB5 /* TUIColor.m */,
+ CBB74C4B13BE6E1900C85CB5 /* TUIControl+TargetAction.m */,
88CC1F2D13E365B500827793 /* TUIControl+Accessibility.h */,
88CC1F2E13E365B500827793 /* TUIControl+Accessibility.m */,
886EBA7D13D64393006DE018 /* TUIControl+Private.h */,
886EBA7E13D64393006DE018 /* TUIControl+Private.m */,
- CBB74C4B13BE6E1900C85CB5 /* TUIControl+TargetAction.m */,
CBB74C4C13BE6E1900C85CB5 /* TUIControl.h */,
CBB74C4D13BE6E1900C85CB5 /* TUIControl.m */,
+ CBB74C4E13BE6E1900C85CB5 /* TUIFastIndexPath.h */,
+ CBB74C4F13BE6E1900C85CB5 /* TUIFastIndexPath.m */,
+ CBB74C5013BE6E1900C85CB5 /* TUIFont.h */,
+ CBB74C5113BE6E1900C85CB5 /* TUIFont.m */,
CBB74C5213BE6E1900C85CB5 /* TUIGeometry.h */,
CBB74C5313BE6E1900C85CB5 /* TUIGeometry.m */,
- D0C7650415B6156A00E7AC2C /* TUIHostView.h */,
+ CBB74C5413BE6E1900C85CB5 /* TUIImage+Drawing.h */,
+ CBB74C5513BE6E1900C85CB5 /* TUIImage+Drawing.m */,
+ CBB74C5613BE6E1900C85CB5 /* TUIImage.h */,
+ CBB74C5713BE6E1900C85CB5 /* TUIImage.m */,
CBB74C5813BE6E1900C85CB5 /* TUIImageView.h */,
CBB74C5913BE6E1900C85CB5 /* TUIImageView.m */,
- CBB74C5B13BE6E1900C85CB5 /* TUIKit.m */,
CBB74C5C13BE6E1900C85CB5 /* TUILabel.h */,
CBB74C5D13BE6E1900C85CB5 /* TUILabel.m */,
- 48A10E7D15B7769A007F9EE3 /* TUILayoutConstraint.h */,
- 48A10E7E15B7769A007F9EE3 /* TUILayoutConstraint.m */,
- 48A10E7F15B7769A007F9EE3 /* TUILayoutManager.h */,
- 48A10E8015B7769A007F9EE3 /* TUILayoutManager.m */,
- D0C7650C15B6189D00E7AC2C /* TUINSHostView.h */,
- D0C7650D15B6189D00E7AC2C /* TUINSHostView.m */,
- 8819794A13E26E5800AA39EB /* TUINSView+Accessibility.h */,
- 8819794B13E26E5800AA39EB /* TUINSView+Accessibility.m */,
CBB74C5E13BE6E1900C85CB5 /* TUINSView+Hyperfocus.h */,
CBB74C5F13BE6E1900C85CB5 /* TUINSView+Hyperfocus.m */,
- D07AA82515BDD72D00F736C0 /* TUINSView+NSTextInputClient.h */,
CBB74C6013BE6E1900C85CB5 /* TUINSView+NSTextInputClient.m */,
- D0C7656915B62EFA00E7AC2C /* TUINSView+Private.h */,
CBB74C6113BE6E1900C85CB5 /* TUINSView.h */,
CBB74C6213BE6E1900C85CB5 /* TUINSView.m */,
+ 8819794A13E26E5800AA39EB /* TUINSView+Accessibility.h */,
+ 8819794B13E26E5800AA39EB /* TUINSView+Accessibility.m */,
CBB74C6313BE6E1900C85CB5 /* TUINSWindow.h */,
CBB74C6413BE6E1900C85CB5 /* TUINSWindow.m */,
884E8F5015387E11000F7A8D /* TUIPopover.h */,
884E8F5115387E11000F7A8D /* TUIPopover.m */,
- 30D399C6156D8ADD006ECDAE /* TUIProgressBar.h */,
- 30D399C7156D8ADD006ECDAE /* TUIProgressBar.m */,
CBB74C6513BE6E1900C85CB5 /* TUIResponder.h */,
CBB74C6613BE6E1900C85CB5 /* TUIResponder.m */,
CBB74C6713BE6E1900C85CB5 /* TUIScrollKnob.h */,
CBB74C6813BE6E1900C85CB5 /* TUIScrollKnob.m */,
- D0C7655015B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.h */,
- D0C7655115B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.m */,
CBB74C6913BE6E1900C85CB5 /* TUIScrollView.h */,
CBB74C6A13BE6E1900C85CB5 /* TUIScrollView.m */,
- D05DEE8A15BF645D005D8769 /* TUIStretchableImage.h */,
- D05DEE8B15BF645D005D8769 /* TUIStretchableImage.m */,
CBB74C6B13BE6E1900C85CB5 /* TUIStringDrawing.h */,
CBB74C6C13BE6E1900C85CB5 /* TUIStringDrawing.m */,
- 88D81CFD1577EF0D009D453B /* TUIStyledView.h */,
- 88D81CFE1577EF0D009D453B /* TUIStyledView.m */,
CBB74C6D13BE6E1900C85CB5 /* TUITableView+Additions.h */,
CBB74C6E13BE6E1900C85CB5 /* TUITableView+Additions.m */,
- 88D25F5313F5D96500CFAAA9 /* TUITableView+Cell.h */,
- 88D25F5413F5D96500CFAAA9 /* TUITableView+Cell.m */,
CBB74C6F13BE6E1900C85CB5 /* TUITableView+Derepeater.h */,
CBB74C7013BE6E1900C85CB5 /* TUITableView+Derepeater.m */,
CBB74C7113BE6E1900C85CB5 /* TUITableView.h */,
CBB74C7213BE6E1900C85CB5 /* TUITableView.m */,
CBB74C7313BE6E1900C85CB5 /* TUITableViewCell.h */,
CBB74C7413BE6E1900C85CB5 /* TUITableViewCell.m */,
+ 88D25F5313F5D96500CFAAA9 /* TUITableView+Cell.h */,
+ 88D25F5413F5D96500CFAAA9 /* TUITableView+Cell.m */,
887F272A13F9969800D75DE6 /* TUITableViewSectionHeader.h */,
887F272B13F9969800D75DE6 /* TUITableViewSectionHeader.m */,
CBB74C7513BE6E1900C85CB5 /* TUITextEditor.h */,
CBB74C7613BE6E1900C85CB5 /* TUITextEditor.m */,
CBB74C7713BE6E1900C85CB5 /* TUITextField.h */,
CBB74C7813BE6E1900C85CB5 /* TUITextField.m */,
- 88A4AFDC145A16C90071CF22 /* TUITextRenderer+Accessibility.h */,
- 88A4AFDD145A16C90071CF22 /* TUITextRenderer+Accessibility.m */,
CBB74C7913BE6E1900C85CB5 /* TUITextRenderer+Event.h */,
CBB74C7A13BE6E1900C85CB5 /* TUITextRenderer+Event.m */,
CBB74C7B13BE6E1900C85CB5 /* TUITextRenderer+KeyBindings.m */,
CBB74C7C13BE6E1900C85CB5 /* TUITextRenderer.h */,
CBB74C7D13BE6E1900C85CB5 /* TUITextRenderer.m */,
+ 88A4AFDC145A16C90071CF22 /* TUITextRenderer+Accessibility.h */,
+ 88A4AFDD145A16C90071CF22 /* TUITextRenderer+Accessibility.m */,
CBB74C7E13BE6E1900C85CB5 /* TUITextView.h */,
CBB74C7F13BE6E1900C85CB5 /* TUITextView.m */,
88EFFB4F13F417E200CF91A9 /* TUITextViewEditor.h */,
@@ -872,20 +655,16 @@
CBB74C8213BE6E1900C85CB5 /* TUIView+Animation.m */,
CBB74C8313BE6E1900C85CB5 /* TUIView+Event.h */,
CBB74C8413BE6E1900C85CB5 /* TUIView+Event.m */,
- 48A10E8A15B77A46007F9EE3 /* TUIView+Layout.h */,
- 48A10E8715B778E8007F9EE3 /* TUIView+Layout.m */,
CBB74C8513BE6E1900C85CB5 /* TUIView+NSTextInputClient.h */,
CBB74C8613BE6E1900C85CB5 /* TUIView+NSTextInputClient.m */,
CBB74C8713BE6E1900C85CB5 /* TUIView+PasteboardDragging.h */,
CBB74C8813BE6E1900C85CB5 /* TUIView+PasteboardDragging.m */,
CBB74C8913BE6E1900C85CB5 /* TUIView+Private.h */,
- D0C7653E15B626E200E7AC2C /* TUIView+TUIBridgedView.h */,
- D0C7653F15B626E200E7AC2C /* TUIView+TUIBridgedView.m */,
+ CBB74C8A13BE6E1900C85CB5 /* TUIView+Private.m */,
CBB74C8B13BE6E1900C85CB5 /* TUIView.h */,
CBB74C8C13BE6E1900C85CB5 /* TUIView.m */,
CBB74C8D13BE6E1900C85CB5 /* TUIViewController.h */,
CBB74C8E13BE6E1900C85CB5 /* TUIViewController.m */,
- D0C7656D15B6322A00E7AC2C /* TUIViewNSViewContainer+Private.h */,
CBB74C8F13BE6E1900C85CB5 /* TUIViewNSViewContainer.h */,
CBB74C9013BE6E1900C85CB5 /* TUIViewNSViewContainer.m */,
C09019E015D0D5C10088A39C /* TUINSImage.h */,
@@ -895,28 +674,6 @@
path = lib/UIKit;
sourceTree = "<group>";
};
- D04007C315BF2BAF00FD49DB /* Products */ = {
- isa = PBXGroup;
- children = (
- D04007CD15BF2BB000FD49DB /* libExpecta.a */,
- D04007CF15BF2BB000FD49DB /* libExpecta-iOS.a */,
- D04007D115BF2BB000FD49DB /* ExpectaTests.octest */,
- D04007D315BF2BB000FD49DB /* Expecta-iOSTests.octest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
- D04007D615BF2BB300FD49DB /* Products */ = {
- isa = PBXGroup;
- children = (
- D04007E015BF2BB300FD49DB /* libSpecta.a */,
- D04007E215BF2BB300FD49DB /* libSpecta-iOS.a */,
- D04007E415BF2BB300FD49DB /* SpectaTests.octest */,
- D04007E615BF2BB300FD49DB /* Specta-iOSTests.octest */,
- );
- name = Products;
- sourceTree = "<group>";
- };
/* End PBXGroup section */
/* Begin PBXHeadersBuildPhase section */
@@ -934,22 +691,6 @@
887F272E13F9969800D75DE6 /* TUITableViewSectionHeader.h in Headers */,
884E8F5415387E11000F7A8D /* TUIPopover.h in Headers */,
884E8F5D1538809C000F7A8D /* CAAnimation+TUIExtensions.h in Headers */,
- D0C764ED15B611C200E7AC2C /* TUIBridgedView.h in Headers */,
- D0C7650715B6156A00E7AC2C /* TUIHostView.h in Headers */,
- D0C7651815B61E5A00E7AC2C /* TUIBridgedScrollView.h in Headers */,
- D0C7653515B624D900E7AC2C /* NSView+TUIExtensions.h in Headers */,
- D0C7654815B626E200E7AC2C /* TUIView+TUIBridgedView.h in Headers */,
- D0C7655415B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.h in Headers */,
- D0C7655F15B6297300E7AC2C /* NSClipView+TUIExtensions.h in Headers */,
- D0C7656515B6297300E7AC2C /* NSScrollView+TUIExtensions.h in Headers */,
- D039724715B7D7D70092CD26 /* TUIView+Layout.h in Headers */,
- D039724915B7D7DC0092CD26 /* TUILayoutManager.h in Headers */,
- D039724B15B7D7DE0092CD26 /* TUILayoutConstraint.h in Headers */,
- D07AA82415BDD6B700F736C0 /* TUINSView+Hyperfocus.h in Headers */,
- D07AA82815BDD72F00F736C0 /* TUINSView+NSTextInputClient.h in Headers */,
- D05DEE8E15BF645D005D8769 /* TUIStretchableImage.h in Headers */,
- D05D23A215BF7239000ED14F /* NSImage+TUIExtensions.h in Headers */,
- D0EA12F315C34FEA00FAA603 /* NSColor+TUIExtensions.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -964,11 +705,13 @@
CBB74C9913BE6E1900C85CB5 /* TUIAttributedString.h in Headers */,
CBB74C9C13BE6E1900C85CB5 /* TUIButton.h in Headers */,
CBB74C9E13BE6E1900C85CB5 /* TUICGAdditions.h in Headers */,
- 30D39A0D156D8F71006ECDAE /* TUIProgressBar.h in Headers */,
+ CBB74CA013BE6E1900C85CB5 /* TUIColor.h in Headers */,
CBB74CA313BE6E1900C85CB5 /* TUIControl.h in Headers */,
+ CBB74CA513BE6E1900C85CB5 /* TUIFastIndexPath.h in Headers */,
+ CBB74CA713BE6E1900C85CB5 /* TUIFont.h in Headers */,
CBB74CA913BE6E1900C85CB5 /* TUIGeometry.h in Headers */,
- 88D81CFF1577EF0D009D453B /* TUIStyledView.h in Headers */,
- 887C227B15C1C7BB006EC31D /* NSFont+TUIExtensions.h in Headers */,
+ CBB74CAB13BE6E1900C85CB5 /* TUIImage+Drawing.h in Headers */,
+ CBB74CAD13BE6E1900C85CB5 /* TUIImage.h in Headers */,
CBB74CAF13BE6E1900C85CB5 /* TUIImageView.h in Headers */,
CBB74CB113BE6E1900C85CB5 /* TUIKit.h in Headers */,
CBB74CB313BE6E1900C85CB5 /* TUILabel.h in Headers */,
@@ -1007,25 +750,7 @@
88EFFB5113F417E200CF91A9 /* TUITextViewEditor.h in Headers */,
88D25F5513F5D96500CFAAA9 /* TUITableView+Cell.h in Headers */,
88A4AFDE145A16CA0071CF22 /* TUITextRenderer+Accessibility.h in Headers */,
-<<<<<<< HEAD
C09019E215D0D5C10088A39C /* TUINSImage.h in Headers */,
-=======
- D0C764EB15B611C200E7AC2C /* TUIBridgedView.h in Headers */,
- D0C7650515B6156A00E7AC2C /* TUIHostView.h in Headers */,
- D0C7651615B61E5A00E7AC2C /* TUIBridgedScrollView.h in Headers */,
- D0C7653315B624D900E7AC2C /* NSView+TUIExtensions.h in Headers */,
- D0C7654615B626E200E7AC2C /* TUIView+TUIBridgedView.h in Headers */,
- D0C7655215B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.h in Headers */,
- D0C7655D15B6297300E7AC2C /* NSClipView+TUIExtensions.h in Headers */,
- D0C7656315B6297300E7AC2C /* NSScrollView+TUIExtensions.h in Headers */,
- 48A10E8115B7769A007F9EE3 /* TUILayoutConstraint.h in Headers */,
- 48A10E8315B7769A007F9EE3 /* TUILayoutManager.h in Headers */,
- 48A10E8B15B77A46007F9EE3 /* TUIView+Layout.h in Headers */,
- D07AA82615BDD72F00F736C0 /* TUINSView+NSTextInputClient.h in Headers */,
- D05DEE8C15BF645D005D8769 /* TUIStretchableImage.h in Headers */,
- D05D23A015BF7239000ED14F /* NSImage+TUIExtensions.h in Headers */,
- D0EA12F115C34FEA00FAA603 /* NSColor+TUIExtensions.h in Headers */,
->>>>>>> bbe70a87d7ae4107ba0dad678d1fec9192ae1588
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1043,22 +768,6 @@
887F272D13F9969800D75DE6 /* TUITableViewSectionHeader.h in Headers */,
884E8F5315387E11000F7A8D /* TUIPopover.h in Headers */,
884E8F5C1538809C000F7A8D /* CAAnimation+TUIExtensions.h in Headers */,
- D0C764EC15B611C200E7AC2C /* TUIBridgedView.h in Headers */,
- D0C7650615B6156A00E7AC2C /* TUIHostView.h in Headers */,
- D0C7651715B61E5A00E7AC2C /* TUIBridgedScrollView.h in Headers */,
- D0C7653415B624D900E7AC2C /* NSView+TUIExtensions.h in Headers */,
- D0C7654715B626E200E7AC2C /* TUIView+TUIBridgedView.h in Headers */,
- D0C7655315B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.h in Headers */,
- D0C7655E15B6297300E7AC2C /* NSClipView+TUIExtensions.h in Headers */,
- D0C7656415B6297300E7AC2C /* NSScrollView+TUIExtensions.h in Headers */,
- D039724615B7D7D60092CD26 /* TUIView+Layout.h in Headers */,
- D039724815B7D7DB0092CD26 /* TUILayoutManager.h in Headers */,
- D039724A15B7D7DE0092CD26 /* TUILayoutConstraint.h in Headers */,
- D07AA82315BDD6B600F736C0 /* TUINSView+Hyperfocus.h in Headers */,
- D07AA82715BDD72F00F736C0 /* TUINSView+NSTextInputClient.h in Headers */,
- D05DEE8D15BF645D005D8769 /* TUIStretchableImage.h in Headers */,
- D05D23A115BF7239000ED14F /* NSImage+TUIExtensions.h in Headers */,
- D0EA12F215C34FEA00FAA603 /* NSColor+TUIExtensions.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1112,8 +821,6 @@
buildRules = (
);
dependencies = (
- D04007E815BF2BBC00FD49DB /* PBXTargetDependency */,
- D04007EA15BF2BBC00FD49DB /* PBXTargetDependency */,
CB5B266613BE6DA300579B1E /* PBXTargetDependency */,
);
name = Tests;
@@ -1144,7 +851,7 @@
CB5B264213BE6DA200579B1E /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0450;
+ LastUpgradeCheck = 0430;
};
buildConfigurationList = CB5B264513BE6DA200579B1E /* Build configuration list for PBXProject "TwUI" */;
compatibilityVersion = "Xcode 3.2";
@@ -1156,16 +863,6 @@
mainGroup = CB5B264013BE6DA200579B1E;
productRefGroup = CB5B264D13BE6DA200579B1E /* Products */;
projectDirPath = "";
- projectReferences = (
- {
- ProductGroup = D04007C315BF2BAF00FD49DB /* Products */;
- ProjectRef = D04007C215BF2BAF00FD49DB /* Expecta.xcodeproj */;
- },
- {
- ProductGroup = D04007D615BF2BB300FD49DB /* Products */;
- ProjectRef = D04007D515BF2BB300FD49DB /* Specta.xcodeproj */;
- },
- );
projectRoot = "";
targets = (
CB5B264B13BE6DA200579B1E /* TwUI */,
@@ -1176,65 +873,6 @@
};
/* End PBXProject section */
-/* Begin PBXReferenceProxy section */
- D04007CD15BF2BB000FD49DB /* libExpecta.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libExpecta.a;
- remoteRef = D04007CC15BF2BB000FD49DB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- D04007CF15BF2BB000FD49DB /* libExpecta-iOS.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libExpecta-iOS.a";
- remoteRef = D04007CE15BF2BB000FD49DB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- D04007D115BF2BB000FD49DB /* ExpectaTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = ExpectaTests.octest;
- remoteRef = D04007D015BF2BB000FD49DB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- D04007D315BF2BB000FD49DB /* Expecta-iOSTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "Expecta-iOSTests.octest";
- remoteRef = D04007D215BF2BB000FD49DB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- D04007E015BF2BB300FD49DB /* libSpecta.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = libSpecta.a;
- remoteRef = D04007DF15BF2BB300FD49DB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- D04007E215BF2BB300FD49DB /* libSpecta-iOS.a */ = {
- isa = PBXReferenceProxy;
- fileType = archive.ar;
- path = "libSpecta-iOS.a";
- remoteRef = D04007E115BF2BB300FD49DB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- D04007E415BF2BB300FD49DB /* SpectaTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = SpectaTests.octest;
- remoteRef = D04007E315BF2BB300FD49DB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
- D04007E615BF2BB300FD49DB /* Specta-iOSTests.octest */ = {
- isa = PBXReferenceProxy;
- fileType = wrapper.cfbundle;
- path = "Specta-iOSTests.octest";
- remoteRef = D04007E515BF2BB300FD49DB /* PBXContainerItemProxy */;
- sourceTree = BUILT_PRODUCTS_DIR;
- };
-/* End PBXReferenceProxy section */
-
/* Begin PBXResourcesBuildPhase section */
CB5B264A13BE6DA200579B1E /* Resources */ = {
isa = PBXResourcesBuildPhase;
@@ -1249,6 +887,7 @@
buildActionMask = 2147483647;
files = (
CB5B266D13BE6DA300579B1E /* InfoPlist.strings in Resources */,
+ CB5B266F13BE6DA300579B1E /* TwUITests.h in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1284,12 +923,18 @@
5EE983C313BE7834005F430D /* TUIButton+Content.m in Sources */,
5EE983C413BE7834005F430D /* TUIButton.m in Sources */,
5EE983C513BE7834005F430D /* TUICGAdditions.m in Sources */,
+ 5EE983C613BE7834005F430D /* TUIColor.m in Sources */,
5EE983C713BE7834005F430D /* TUIControl+TargetAction.m in Sources */,
5EE983C813BE7834005F430D /* TUIControl.m in Sources */,
+ 5EE983C913BE7834005F430D /* TUIFastIndexPath.m in Sources */,
+ 5EE983CA13BE7834005F430D /* TUIFont.m in Sources */,
5EE983CB13BE7834005F430D /* TUIGeometry.m in Sources */,
+ 5EE983CC13BE7834005F430D /* TUIImage+Drawing.m in Sources */,
+ 5EE983CD13BE7834005F430D /* TUIImage.m in Sources */,
5EE983CE13BE7834005F430D /* TUIImageView.m in Sources */,
5EE983CF13BE7834005F430D /* TUILabel.m in Sources */,
5EE983D013BE7834005F430D /* TUINSView+Hyperfocus.m in Sources */,
+ 5EE983D113BE7834005F430D /* TUINSView+NSTextInputClient.m in Sources */,
5EE983D213BE7834005F430D /* TUINSView.m in Sources */,
5EE983D313BE7834005F430D /* TUINSWindow.m in Sources */,
5EE983D413BE7834005F430D /* TUIResponder.m in Sources */,
@@ -1311,6 +956,7 @@
5EE983E413BE7834005F430D /* TUIView+Event.m in Sources */,
5EE983E513BE7834005F430D /* TUIView+NSTextInputClient.m in Sources */,
5EE983E613BE7834005F430D /* TUIView+PasteboardDragging.m in Sources */,
+ 5EE983E713BE7834005F430D /* TUIView+Private.m in Sources */,
5EE983E813BE7834005F430D /* TUIView.m in Sources */,
5EE983E913BE7834005F430D /* TUIViewController.m in Sources */,
5EE983EA13BE7834005F430D /* TUIViewNSViewContainer.m in Sources */,
@@ -1324,27 +970,7 @@
887F273113F9969800D75DE6 /* TUITableViewSectionHeader.m in Sources */,
884E8F5715387E11000F7A8D /* TUIPopover.m in Sources */,
884E8F601538809C000F7A8D /* CAAnimation+TUIExtensions.m in Sources */,
-<<<<<<< HEAD
C09019E615D0DD2C0088A39C /* TUINSImage.m in Sources */,
-=======
- D0C7651315B6189D00E7AC2C /* TUINSHostView.m in Sources */,
- D0C7652915B6232100E7AC2C /* CALayer+TUIExtensions.m in Sources */,
- D0C7652F15B6232100E7AC2C /* CATransaction+TUIExtensions.m in Sources */,
- D0C7653815B624D900E7AC2C /* NSView+TUIExtensions.m in Sources */,
- D0C7654B15B626E200E7AC2C /* TUIView+TUIBridgedView.m in Sources */,
- D0C7655715B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.m in Sources */,
- D0C7656215B6297300E7AC2C /* NSClipView+TUIExtensions.m in Sources */,
- D0C7656815B6297300E7AC2C /* NSScrollView+TUIExtensions.m in Sources */,
- D0C7657615B6341800E7AC2C /* TUICAAction.m in Sources */,
- D040611815B6A7CD00F753ED /* NSTextView+TUIExtensions.m in Sources */,
- D039724115B7D7CC0092CD26 /* TUILayoutConstraint.m in Sources */,
- D039724315B7D7CE0092CD26 /* TUILayoutManager.m in Sources */,
- D039724515B7D7D40092CD26 /* TUIView+Layout.m in Sources */,
- D07AA82B15BDD79A00F736C0 /* TUINSView+NSTextInputClient.m in Sources */,
- D05DEE9115BF645D005D8769 /* TUIStretchableImage.m in Sources */,
- D05D23A515BF7239000ED14F /* NSImage+TUIExtensions.m in Sources */,
- D0EA12F615C34FEA00FAA603 /* NSColor+TUIExtensions.m in Sources */,
->>>>>>> bbe70a87d7ae4107ba0dad678d1fec9192ae1588
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1360,13 +986,19 @@
CBB74C9B13BE6E1900C85CB5 /* TUIButton+Content.m in Sources */,
CBB74C9D13BE6E1900C85CB5 /* TUIButton.m in Sources */,
CBB74C9F13BE6E1900C85CB5 /* TUICGAdditions.m in Sources */,
+ CBB74CA113BE6E1900C85CB5 /* TUIColor.m in Sources */,
CBB74CA213BE6E1900C85CB5 /* TUIControl+TargetAction.m in Sources */,
CBB74CA413BE6E1900C85CB5 /* TUIControl.m in Sources */,
+ CBB74CA613BE6E1900C85CB5 /* TUIFastIndexPath.m in Sources */,
+ CBB74CA813BE6E1900C85CB5 /* TUIFont.m in Sources */,
CBB74CAA13BE6E1900C85CB5 /* TUIGeometry.m in Sources */,
+ CBB74CAC13BE6E1900C85CB5 /* TUIImage+Drawing.m in Sources */,
+ CBB74CAE13BE6E1900C85CB5 /* TUIImage.m in Sources */,
CBB74CB013BE6E1900C85CB5 /* TUIImageView.m in Sources */,
CBB74CB213BE6E1900C85CB5 /* TUIKit.m in Sources */,
CBB74CB413BE6E1900C85CB5 /* TUILabel.m in Sources */,
CBB74CB613BE6E1900C85CB5 /* TUINSView+Hyperfocus.m in Sources */,
+ CBB74CB713BE6E1900C85CB5 /* TUINSView+NSTextInputClient.m in Sources */,
CBB74CB913BE6E1900C85CB5 /* TUINSView.m in Sources */,
CBB74CBB13BE6E1900C85CB5 /* TUINSWindow.m in Sources */,
CBB74CBD13BE6E1900C85CB5 /* TUIResponder.m in Sources */,
@@ -1388,6 +1020,7 @@
CBB74CDB13BE6E1900C85CB5 /* TUIView+Event.m in Sources */,
CBB74CDD13BE6E1900C85CB5 /* TUIView+NSTextInputClient.m in Sources */,
CBB74CDF13BE6E1900C85CB5 /* TUIView+PasteboardDragging.m in Sources */,
+ CBB74CE113BE6E1900C85CB5 /* TUIView+Private.m in Sources */,
CBB74CE313BE6E1900C85CB5 /* TUIView.m in Sources */,
CBB74CE513BE6E1900C85CB5 /* TUIViewController.m in Sources */,
CBB74CE713BE6E1900C85CB5 /* TUIViewNSViewContainer.m in Sources */,
@@ -1402,30 +1035,7 @@
88A4AFDF145A16CA0071CF22 /* TUITextRenderer+Accessibility.m in Sources */,
884E8F5515387E11000F7A8D /* TUIPopover.m in Sources */,
884E8F5E1538809C000F7A8D /* CAAnimation+TUIExtensions.m in Sources */,
-<<<<<<< HEAD
C09019E315D0D5C10088A39C /* TUINSImage.m in Sources */,
-=======
- 30D399C9156D8ADD006ECDAE /* TUIProgressBar.m in Sources */,
- 88D81D001577EF0D009D453B /* TUIStyledView.m in Sources */,
- D0C7651115B6189D00E7AC2C /* TUINSHostView.m in Sources */,
- D0C7652715B6232100E7AC2C /* CALayer+TUIExtensions.m in Sources */,
- D0C7652D15B6232100E7AC2C /* CATransaction+TUIExtensions.m in Sources */,
- D0C7653615B624D900E7AC2C /* NSView+TUIExtensions.m in Sources */,
- D0C7654915B626E200E7AC2C /* TUIView+TUIBridgedView.m in Sources */,
- D0C7655515B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.m in Sources */,
- D0C7656015B6297300E7AC2C /* NSClipView+TUIExtensions.m in Sources */,
- D0C7656615B6297300E7AC2C /* NSScrollView+TUIExtensions.m in Sources */,
- D0C7657415B6341800E7AC2C /* TUICAAction.m in Sources */,
- D040611615B6A7CD00F753ED /* NSTextView+TUIExtensions.m in Sources */,
- 48A10E8215B7769A007F9EE3 /* TUILayoutConstraint.m in Sources */,
- 48A10E8415B7769A007F9EE3 /* TUILayoutManager.m in Sources */,
- 48A10E8915B778E8007F9EE3 /* TUIView+Layout.m in Sources */,
- D07AA82915BDD79900F736C0 /* TUINSView+NSTextInputClient.m in Sources */,
- D05DEE8F15BF645D005D8769 /* TUIStretchableImage.m in Sources */,
- D05D23A315BF7239000ED14F /* NSImage+TUIExtensions.m in Sources */,
- 887C227C15C1C7BB006EC31D /* NSFont+TUIExtensions.m in Sources */,
- D0EA12F415C34FEA00FAA603 /* NSColor+TUIExtensions.m in Sources */,
->>>>>>> bbe70a87d7ae4107ba0dad678d1fec9192ae1588
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1450,13 +1060,19 @@
CB5E322213BE70CA004B7899 /* TUIButton+Content.m in Sources */,
CB5E322413BE70CA004B7899 /* TUIButton.m in Sources */,
CB5E322613BE70CA004B7899 /* TUICGAdditions.m in Sources */,
+ CB5E322813BE70CA004B7899 /* TUIColor.m in Sources */,
CB5E322913BE70CA004B7899 /* TUIControl+TargetAction.m in Sources */,
CB5E322B13BE70CA004B7899 /* TUIControl.m in Sources */,
+ CB5E322D13BE70CA004B7899 /* TUIFastIndexPath.m in Sources */,
+ CB5E322F13BE70CA004B7899 /* TUIFont.m in Sources */,
CB5E323113BE70CA004B7899 /* TUIGeometry.m in Sources */,
+ CB5E323313BE70CA004B7899 /* TUIImage+Drawing.m in Sources */,
+ CB5E323513BE70CA004B7899 /* TUIImage.m in Sources */,
CB5E323713BE70CA004B7899 /* TUIImageView.m in Sources */,
CB5E323913BE70CA004B7899 /* TUIKit.m in Sources */,
CB5E323B13BE70CA004B7899 /* TUILabel.m in Sources */,
CB5E323D13BE70CA004B7899 /* TUINSView+Hyperfocus.m in Sources */,
+ CB5E323E13BE70CA004B7899 /* TUINSView+NSTextInputClient.m in Sources */,
CB5E324013BE70CA004B7899 /* TUINSView.m in Sources */,
CB5E324213BE70CA004B7899 /* TUINSWindow.m in Sources */,
CB5E324413BE70CA004B7899 /* TUIResponder.m in Sources */,
@@ -1478,6 +1094,7 @@
CB5E326213BE70CA004B7899 /* TUIView+Event.m in Sources */,
CB5E326413BE70CA004B7899 /* TUIView+NSTextInputClient.m in Sources */,
CB5E326613BE70CA004B7899 /* TUIView+PasteboardDragging.m in Sources */,
+ CB5E326813BE70CA004B7899 /* TUIView+Private.m in Sources */,
CB5E326A13BE70CA004B7899 /* TUIView.m in Sources */,
CB5E326C13BE70CA004B7899 /* TUIViewController.m in Sources */,
CB5E326E13BE70CA004B7899 /* TUIViewNSViewContainer.m in Sources */,
@@ -1491,27 +1108,7 @@
887F273013F9969800D75DE6 /* TUITableViewSectionHeader.m in Sources */,
884E8F5615387E11000F7A8D /* TUIPopover.m in Sources */,
884E8F5F1538809C000F7A8D /* CAAnimation+TUIExtensions.m in Sources */,
-<<<<<<< HEAD
C09019E515D0DD2B0088A39C /* TUINSImage.m in Sources */,
-=======
- D0C7651215B6189D00E7AC2C /* TUINSHostView.m in Sources */,
- D0C7652815B6232100E7AC2C /* CALayer+TUIExtensions.m in Sources */,
- D0C7652E15B6232100E7AC2C /* CATransaction+TUIExtensions.m in Sources */,
- D0C7653715B624D900E7AC2C /* NSView+TUIExtensions.m in Sources */,
- D0C7654A15B626E200E7AC2C /* TUIView+TUIBridgedView.m in Sources */,
- D0C7655615B6294400E7AC2C /* TUIScrollView+TUIBridgedScrollView.m in Sources */,
- D0C7656115B6297300E7AC2C /* NSClipView+TUIExtensions.m in Sources */,
- D0C7656715B6297300E7AC2C /* NSScrollView+TUIExtensions.m in Sources */,
- D0C7657515B6341800E7AC2C /* TUICAAction.m in Sources */,
- D040611715B6A7CD00F753ED /* NSTextView+TUIExtensions.m in Sources */,
- D039723F15B7D7CB0092CD26 /* TUILayoutConstraint.m in Sources */,
- D039724215B7D7CE0092CD26 /* TUILayoutManager.m in Sources */,
- D039724415B7D7D40092CD26 /* TUIView+Layout.m in Sources */,
- D07AA82A15BDD79A00F736C0 /* TUINSView+NSTextInputClient.m in Sources */,
- D05DEE9015BF645D005D8769 /* TUIStretchableImage.m in Sources */,
- D05D23A415BF7239000ED14F /* NSImage+TUIExtensions.m in Sources */,
- D0EA12F515C34FEA00FAA603 /* NSColor+TUIExtensions.m in Sources */,
->>>>>>> bbe70a87d7ae4107ba0dad678d1fec9192ae1588
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1523,16 +1120,6 @@
target = CB5B264B13BE6DA200579B1E /* TwUI */;
targetProxy = CB5B266513BE6DA300579B1E /* PBXContainerItemProxy */;
};
- D04007E815BF2BBC00FD49DB /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = Expecta;
- targetProxy = D04007E715BF2BBC00FD49DB /* PBXContainerItemProxy */;
- };
- D04007EA15BF2BBC00FD49DB /* PBXTargetDependency */ = {
- isa = PBXTargetDependency;
- name = Specta;
- targetProxy = D04007E915BF2BBC00FD49DB /* PBXContainerItemProxy */;
- };
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
@@ -1577,7 +1164,6 @@
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
- COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
@@ -1600,7 +1186,6 @@
OTHER_CFLAGS = "-DNS_BUILD_32_LIKE_64";
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx;
- TEST_AFTER_BUILD = YES;
VALID_ARCHS = x86_64;
};
name = Debug;
@@ -1611,7 +1196,6 @@
ALWAYS_SEARCH_USER_PATHS = YES;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
- COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -1631,7 +1215,6 @@
OTHER_CFLAGS = "-DNS_BUILD_32_LIKE_64";
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = macosx;
- TEST_AFTER_BUILD = YES;
VALID_ARCHS = x86_64;
};
name = Release;
@@ -1668,13 +1251,8 @@
buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
- GCC_PREFIX_HEADER = "TwUITests/TwUITests-Prefix.pch";
- HEADER_SEARCH_PATHS = (
- "TwUITests/expecta/src/**",
- "TwUITests/specta/src/**",
- );
+ GCC_PREFIX_HEADER = "TwUI/TwUI-Prefix.pch";
INFOPLIST_FILE = "TwUITests/TwUITests-Info.plist";
- OTHER_LDFLAGS = "-all_load";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = octest;
};
@@ -1685,13 +1263,8 @@
buildSettings = {
CLANG_ENABLE_OBJC_ARC = YES;
FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
- GCC_PREFIX_HEADER = "TwUITests/TwUITests-Prefix.pch";
- HEADER_SEARCH_PATHS = (
- "TwUITests/expecta/src/**",
- "TwUITests/specta/src/**",
- );
+ GCC_PREFIX_HEADER = "TwUI/TwUI-Prefix.pch";
INFOPLIST_FILE = "TwUITests/TwUITests-Info.plist";
- OTHER_LDFLAGS = "-all_load";
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = octest;
};
View
59 TwUI.xcodeproj/xcshareddata/xcschemes/Dynamic Library.xcscheme
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "0450"
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "CB5E321713BE7098004B7899"
- BuildableName = "libtwui.dylib"
- BlueprintName = "Dynamic Library"
- ReferencedContainer = "container:TwUI.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
- <Testables>
- </Testables>
- </TestAction>
- <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- allowLocationSimulation = "YES">
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
View
59 TwUI.xcodeproj/xcshareddata/xcschemes/Static Library.xcscheme
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "0450"
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "5EE983B613BE7809005F430D"
- BuildableName = "libtwui.a"
- BlueprintName = "Static Library"
- ReferencedContainer = "container:TwUI.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
- <Testables>
- </Testables>
- </TestAction>
- <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- allowLocationSimulation = "YES">
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
View
83 TwUI.xcodeproj/xcshareddata/xcschemes/TwUI.xcscheme
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Scheme
- LastUpgradeVersion = "0450"
- version = "1.3">
- <BuildAction
- parallelizeBuildables = "YES"
- buildImplicitDependencies = "YES">
- <BuildActionEntries>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "YES"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "CB5B264B13BE6DA200579B1E"
- BuildableName = "TwUI.framework"
- BlueprintName = "TwUI"
- ReferencedContainer = "container:TwUI.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- <BuildActionEntry
- buildForTesting = "YES"
- buildForRunning = "YES"
- buildForProfiling = "YES"
- buildForArchiving = "NO"
- buildForAnalyzing = "YES">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "CB5B266013BE6DA300579B1E"
- BuildableName = "Tests.octest"
- BlueprintName = "Tests"
- ReferencedContainer = "container:TwUI.xcodeproj">
- </BuildableReference>
- </BuildActionEntry>
- </BuildActionEntries>
- </BuildAction>
- <TestAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- shouldUseLaunchSchemeArgsEnv = "YES"
- buildConfiguration = "Debug">
- <Testables>
- <TestableReference
- skipped = "NO">
- <BuildableReference
- BuildableIdentifier = "primary"
- BlueprintIdentifier = "CB5B266013BE6DA300579B1E"
- BuildableName = "Tests.octest"
- BlueprintName = "Tests"
- ReferencedContainer = "container:TwUI.xcodeproj">
- </BuildableReference>
- </TestableReference>
- </Testables>
- </TestAction>
- <LaunchAction
- selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
- selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
- launchStyle = "0"
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Debug"
- ignoresPersistentStateOnLaunch = "NO"
- debugDocumentVersioning = "YES"
- allowLocationSimulation = "YES">
- <AdditionalOptions>
- </AdditionalOptions>
- </LaunchAction>
- <ProfileAction
- shouldUseLaunchSchemeArgsEnv = "YES"
- savedToolIdentifier = ""
- useCustomWorkingDirectory = "NO"
- buildConfiguration = "Release"
- debugDocumentVersioning = "YES">
- </ProfileAction>
- <AnalyzeAction
- buildConfiguration = "Debug">
- </AnalyzeAction>
- <ArchiveAction
- buildConfiguration = "Release"
- revealArchiveInOrganizer = "YES">
- </ArchiveAction>
-</Scheme>
View
12 TwUITests/TwUITests-Prefix.pch
@@ -1,12 +0,0 @@
-//
-// Prefix header for all source files of the 'TwUITests' target in the 'TwUI' project
-//
-
-#ifdef __OBJC__
- #import <Cocoa/Cocoa.h>
- #import "Specta.h"
-
- #define EXP_SHORTHAND
- #import "Expecta.h"
-#endif
-
View
13 TwUITests/TwUITests.h
@@ -0,0 +1,13 @@
+//
+// TwUITests.h
+// TwUITests
+//
+// Created by Karl Adam on 11.07.01.
+// Copyright 2011 __MyCompanyName__. All rights reserved.
+//
+
+#import <SenTestingKit/SenTestingKit.h>
+
+@interface TwUITests : SenTestCase
+
+@end
View
28 TwUITests/TwUITests.m
@@ -3,12 +3,30 @@
// TwUITests
//
// Created by Karl Adam on 11.07.01.
+// Copyright 2011 __MyCompanyName__. All rights reserved.
//
-SpecBegin(TwUITests)
+#import "TwUITests.h"
- it(@"should use specta and expecta", ^{
- expect(YES).to.beTruthy();
- });
+@implementation TwUITests
-SpecEnd
+- (void)setUp
+{
+ [super setUp];
+
+ // Set-up code here.
+}
+
+- (void)tearDown
+{
+ // Tear-down code here.
+
+ [super tearDown];
+}
+
+- (void)testExample
+{
+ STFail(@"Unit tests are not implemented yet in TwUITests");
+}
+
+@end
1  TwUITests/specta
@@ -1 +0,0 @@
-Subproject commit 948bfa115a0a422f1d254797e49bcc1468f03606
View
39 lib/Support/CALayer+TUIExtensions.h
@@ -1,39 +0,0 @@
-//
-// CALayer+TUIExtensions.h
-//
-// Created by Josh Vera on 11/26/11.
-// Copyright (c) 2011 Bitswift. All rights reserved.
-//
-
-#import <QuartzCore/QuartzCore.h>
-
-/**
- * Additional geometry conversions and geometrical functions for CALayer.
- */
-@interface CALayer (TUIExtensions)
-/**
- * Converts a rectangle from the receiver's coordinate system to that of a given
- * layer, taking into account any layer clipping between the two.
- *
- * This will traverse the layer hierarchy, finding a common ancestor between the
- * receiver and 'layer' to use as a base for geometry conversion. If any layers
- * along the way (including the receiver, 'layer', and the common ancestor) have
- * masksToBounds set to YES, the rectangle takes into account their clipping
- * paths, such that the final result represents a rectangle that would actually
- * be visible on screen.
- *
- * The receiver and 'layer' must have a common ancestor.
- */
-- (CGRect)tui_convertAndClipRect:(CGRect)rect toLayer:(CALayer *)layer;
-
-/**
- * Converts a rectangle from the coordinate system of 'layer' to the
- * receiver's, taking into account any layer clipping between the two.
- *
- * This will call -tui_convertAndClipRect:toLayer:> on 'layer' with the receiver
- * as the argument.
- *
- * The receiver and 'layer' must have a common ancestor.
- */
-- (CGRect)tui_convertAndClipRect:(CGRect)rect fromLayer:(CALayer *)layer;
-@end
View
55 lib/Support/CALayer+TUIExtensions.m
@@ -1,55 +0,0 @@
-//
-// CALayer+TUIExtensions.m
-//
-// Created by Josh Vera on 11/26/11.
-// Copyright (c) 2011 Bitswift. All rights reserved.
-//
-
-#import "CALayer+TUIExtensions.h"
-
-static CGRect convertAndClipRectFromSuperlayers (CGRect rect, CALayer *layer);
-
-static CGRect convertAndClipRectFromSuperlayers (CGRect rect, CALayer *layer) {
- CALayer *superlayer = layer.superlayer;
- if (superlayer) {
- rect = convertAndClipRectFromSuperlayers(rect, superlayer);
- if (CGRectIsNull(rect))
- return CGRectNull;
-
- rect = [layer convertRect:rect fromLayer:superlayer];
- }
-
- if (layer.masksToBounds) {
- rect = CGRectIntersection(rect, layer.visibleRect);
- }
-
- return rect;
-}
-
-@implementation CALayer (TUIExtensions)
-- (CGRect)tui_convertAndClipRect:(CGRect)rect toLayer:(CALayer *)layer {
- CALayer *clippingLayer = self.superlayer;
- CALayer *lastLayer = self;
- while (clippingLayer) {
- if (lastLayer.masksToBounds) {
- rect = CGRectIntersection(rect, lastLayer.visibleRect);
- if (CGRectIsNull(rect))
- return CGRectNull;
- }
-
- rect = [clippingLayer convertRect:rect fromLayer:lastLayer];
-
- lastLayer = clippingLayer;
- clippingLayer = clippingLayer.superlayer;
- }
-
- // 'rect' is in the coordinate system of the root layer, and has been
- // clipped accordingly
- return convertAndClipRectFromSuperlayers(rect, layer);
-}
-
-- (CGRect)tui_convertAndClipRect:(CGRect)rect fromLayer:(CALayer *)layer {
- return [layer tui_convertAndClipRect:rect toLayer:self];
-}
-
-@end
View
22 lib/Support/CATransaction+TUIExtensions.h
@@ -1,22 +0,0 @@
-//
-// CATransaction+TUIExtensions.h
-//
-// Created by James Lawton on 11/23/11.
-// Copyright (c) 2011 Bitswift. All rights reserved.
-//
-
-#import <QuartzCore/QuartzCore.h>
-
-/**
- * Extends CATransaction with useful block-based features.
- */
-@interface CATransaction (TUIExtensions)
-
-/**
- * Executes a block with actions disabled.
- *
- * This will have the effect of suppressing animation.
- */
-+ (void)tui_performWithDisabledActions:(void(^)(void))block;
-
-@end
View
22 lib/Support/CATransaction+TUIExtensions.m
@@ -1,22 +0,0 @@
-//
-// CATransaction+TUIExtensions.m
-//
-// Created by James Lawton on 11/23/11.
-// Copyright (c) 2011 Bitswift. All rights reserved.
-//
-
-#import "CATransaction+TUIExtensions.h"
-
-@implementation CATransaction (TUIExtensions)
-+ (void)tui_performWithDisabledActions:(void(^)(void))block {
- if ([self disableActions]) {
- // actions are already disabled
- block();
- } else {
- [self setDisableActions:YES];
- block();
- [self setDisableActions:NO];
- }
-}
-
-@end
View
18 lib/Support/NSFont+TUIExtensions.h
@@ -1,18 +0,0 @@
-//
-// NSFont+TUIExtensions.h
-// TwUI
-//
-// Created by Josh Abernathy on 7/26/12.
-//
-//
-
-#import <Cocoa/Cocoa.h>
-
-
-@interface NSFont (TUIExtensions)
-
-// Creates and returns a new font with the given size and fallback font names.
-// The fallback fonts all use the font size passed in.
-+ (NSFont *)tui_fontWithName:(NSString *)fontName size:(CGFloat)fontSize fallbackNames:(NSArray *)fallbackNames;
-
-@end
View
23 lib/Support/NSFont+TUIExtensions.m
@@ -1,23 +0,0 @@
-//
-// NSFont+TUIExtensions.m
-// TwUI
-//
-// Created by Josh Abernathy on 7/26/12.
-//
-//
-
-#import "NSFont+TUIExtensions.h"
-
-
-@implementation NSFont (TUIExtensions)
-
-+ (NSFont *)tui_fontWithName:(NSString *)fontName size:(CGFloat)fontSize fallbackNames:(NSArray *)fallbackNames {
- NSMutableArray *fallbackDescriptors = [NSMutableArray arrayWithCapacity:fallbackNames.count];
- for(NSString *fallbackName in fallbackNames) {
- [fallbackDescriptors addObject:[NSFontDescriptor fontDescriptorWithName:fallbackName size:fontSize]];
- }
-
- return [NSFont fontWithDescriptor:[NSFontDescriptor fontDescriptorWithFontAttributes:@{ NSFontNameAttribute: fontName, NSFontCascadeListAttribute: fallbackDescriptors }] size:fontSize];
-}
-
-@end
View
15 lib/Support/NSTextView+TUIExtensions.h
@@ -1,15 +0,0 @@
-//
-// NSTextView+TUIExtensions.h
-//
-// Created by Justin Spahr-Summers on 10.03.12.
-// Copyright (c) 2012 Bitswift. All rights reserved.
-//
-
-#import <Cocoa/Cocoa.h>
-
-/**
- * This private category fixes blurry text in layer-backed text views and text
- * fields.