Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #20 from github/imports-cleanup

Removed unnecessary #imports to reduce compilation time
  • Loading branch information...
commit 763133bf7adbaad43da2115f53a17cb590473ea7 2 parents 19ae557 + 6ae2f1a
@joshaber joshaber authored
Showing with 288 additions and 193 deletions.
  1. +30 −18 TwUI.xcodeproj/project.pbxproj
  2. +1 −1  lib/UIKit/NSView+TUIExtensions.h
  3. +1 −0  lib/UIKit/TUIActivityIndicatorView.m
  4. +5 −1 lib/UIKit/TUIButton.m
  5. +25 −0 lib/UIKit/TUICGAdditions.h
  6. +88 −0 lib/UIKit/TUICGAdditions.m
  7. +2 −1  lib/UIKit/TUIColor.m
  8. +2 −1  lib/UIKit/TUIImage+Drawing.m
  9. +2 −1  lib/UIKit/TUIImage.m
  10. +0 −1  lib/UIKit/TUIImageView.m
  11. +2 −22 lib/UIKit/TUIKit.h
  12. +0 −88 lib/UIKit/TUIKit.m
  13. +0 −1  lib/UIKit/TUILabel.h
  14. +3 −1 lib/UIKit/TUILabel.m
  15. +1 −0  lib/UIKit/TUILayoutConstraint.m
  16. +1 −2  lib/UIKit/TUILayoutManager.h
  17. +1 −0  lib/UIKit/TUILayoutManager.m
  18. +1 −0  lib/UIKit/TUINSView+Hyperfocus.m
  19. +20 −0 lib/UIKit/TUINSView+NSTextInputClient.h
  20. +7 −2 lib/UIKit/TUINSView+NSTextInputClient.m
  21. +3 −0  lib/UIKit/TUINSView+Private.h
  22. +4 −4 lib/UIKit/TUINSView.h
  23. +2 −5 lib/UIKit/TUINSView.m
  24. +2 −1  lib/UIKit/TUINSWindow.h
  25. +3 −0  lib/UIKit/TUINSWindow.m
  26. +4 −4 lib/UIKit/TUIPopover.m
  27. +2 −1  lib/UIKit/TUIProgressBar.m
  28. +2 −2 lib/UIKit/TUIScrollKnob.m
  29. +2 −1  lib/UIKit/TUIScrollView.m
  30. +3 −3 lib/UIKit/TUIStringDrawing.m
  31. +3 −3 lib/UIKit/TUIStyledView.m
  32. +1 −0  lib/UIKit/TUITableView+Cell.m
  33. +2 −1  lib/UIKit/TUITableView.h
  34. +3 −1 lib/UIKit/TUITableView.m
  35. +2 −1  lib/UIKit/TUITableViewCell.h
  36. +3 −2 lib/UIKit/TUITableViewCell.m
  37. +3 −1 lib/UIKit/TUITextEditor.m
  38. +2 −1  lib/UIKit/TUITextField.m
  39. +7 −3 lib/UIKit/TUITextRenderer+Event.m
  40. +1 −1  lib/UIKit/TUITextRenderer.h
  41. +7 −4 lib/UIKit/TUITextRenderer.m
  42. +5 −1 lib/UIKit/TUITextView.m
  43. +4 −1 lib/UIKit/TUITooltipWindow.m
  44. +5 −4 lib/UIKit/TUIView+Event.m
  45. +3 −1 lib/UIKit/TUIView+Layout.h
  46. +1 −0  lib/UIKit/TUIView+Layout.m
  47. +1 −1  lib/UIKit/TUIView+PasteboardDragging.h
  48. +3 −1 lib/UIKit/TUIView+PasteboardDragging.m
  49. +2 −1  lib/UIKit/TUIView+Private.h
  50. +2 −2 lib/UIKit/TUIView.h
  51. +5 −1 lib/UIKit/TUIView.m
  52. +2 −1  lib/UIKit/TUIViewController.h
  53. +2 −0  lib/UIKit/TUIViewController.m
View
48 TwUI.xcodeproj/project.pbxproj
@@ -39,7 +39,6 @@
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 */; };
@@ -157,7 +156,6 @@
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 */; };
@@ -224,7 +222,6 @@
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, ); }; };
@@ -272,12 +269,32 @@
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 */; };
D040610D15B6A77500F753ED /* TUIAnimationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D040610915B6A77500F753ED /* TUIAnimationManager.m */; };
D040610E15B6A77500F753ED /* TUIAnimationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D040610915B6A77500F753ED /* TUIAnimationManager.m */; };
D040610F15B6A77500F753ED /* TUIAnimationManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D040610915B6A77500F753ED /* TUIAnimationManager.m */; };
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 */; };
+ 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, ); }; };
@@ -329,18 +346,6 @@
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 */; };
- 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 */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -494,6 +499,7 @@
D040610915B6A77500F753ED /* TUIAnimationManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TUIAnimationManager.m; 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>"; };
+ 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>"; };
@@ -737,6 +743,7 @@
48A10E8015B7769A007F9EE3 /* TUILayoutManager.m */,
CBB74C5E13BE6E1900C85CB5 /* TUINSView+Hyperfocus.h */,
CBB74C5F13BE6E1900C85CB5 /* TUINSView+Hyperfocus.m */,
+ D07AA82515BDD72D00F736C0 /* TUINSView+NSTextInputClient.h */,
CBB74C6013BE6E1900C85CB5 /* TUINSView+NSTextInputClient.m */,
D0C7656915B62EFA00E7AC2C /* TUINSView+Private.h */,
CBB74C6113BE6E1900C85CB5 /* TUINSView.h */,
@@ -842,6 +849,8 @@
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 */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -914,6 +923,7 @@
48A10E8115B7769A007F9EE3 /* TUILayoutConstraint.h in Headers */,
48A10E8315B7769A007F9EE3 /* TUILayoutManager.h in Headers */,
48A10E8B15B77A46007F9EE3 /* TUIView+Layout.h in Headers */,
+ D07AA82615BDD72F00F736C0 /* TUINSView+NSTextInputClient.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -942,6 +952,8 @@
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 */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1108,7 +1120,6 @@
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 */,
@@ -1157,6 +1168,7 @@
D039724115B7D7CC0092CD26 /* TUILayoutConstraint.m in Sources */,
D039724315B7D7CE0092CD26 /* TUILayoutManager.m in Sources */,
D039724515B7D7D40092CD26 /* TUIView+Layout.m in Sources */,
+ D07AA82B15BDD79A00F736C0 /* TUINSView+NSTextInputClient.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1184,7 +1196,6 @@
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 */,
@@ -1236,6 +1247,7 @@
48A10E8215B7769A007F9EE3 /* TUILayoutConstraint.m in Sources */,
48A10E8415B7769A007F9EE3 /* TUILayoutManager.m in Sources */,
48A10E8915B778E8007F9EE3 /* TUIView+Layout.m in Sources */,
+ D07AA82915BDD79900F736C0 /* TUINSView+NSTextInputClient.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -1272,7 +1284,6 @@
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 */,
@@ -1321,6 +1332,7 @@
D039723F15B7D7CB0092CD26 /* TUILayoutConstraint.m in Sources */,
D039724215B7D7CE0092CD26 /* TUILayoutManager.m in Sources */,
D039724415B7D7D40092CD26 /* TUIView+Layout.m in Sources */,
+ D07AA82A15BDD79A00F736C0 /* TUINSView+NSTextInputClient.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
2  lib/UIKit/NSView+TUIExtensions.h
@@ -11,9 +11,9 @@
#import <AppKit/AppKit.h>
#import "TUIBridgedView.h"
-#import "TUIHostView.h"
@class TUIViewNSViewContainer;
+@protocol TUIHostView;
/**
* Implements <TUIBridgedView> for NSView.
View
1  lib/UIKit/TUIActivityIndicatorView.m
@@ -15,6 +15,7 @@
*/
#import "TUIActivityIndicatorView.h"
+#import "TUIColor.h"
@implementation TUIActivityIndicatorView
View
6 lib/UIKit/TUIButton.m
@@ -16,9 +16,13 @@
#import "TUIImage.h"
#import "TUIButton.h"
+#import "TUICGAdditions.h"
+#import "TUIColor.h"
+#import "TUIControl+Private.h"
+#import "TUIImageView.h"
#import "TUILabel.h"
#import "TUINSView.h"
-#import "TUIControl+Private.h"
+#import "TUITextRenderer.h"
@interface TUIButton ()
View
25 lib/UIKit/TUICGAdditions.h
@@ -29,6 +29,9 @@ typedef NSUInteger TUICGRoundedRectCorner;
#import <Foundation/Foundation.h>
+@class TUIImage;
+@class TUIView;
+
extern CGContextRef TUICreateOpaqueGraphicsContext(CGSize size);
extern CGContextRef TUICreateGraphicsContext(CGSize size);
extern CGContextRef TUICreateGraphicsContextWithOptions(CGSize size, BOOL opaque);
@@ -47,3 +50,25 @@ extern CGRect ABIntegralRectWithSizeCenteredInRect(CGSize s, CGRect r);
extern void CGContextFillRoundRect(CGContextRef context, CGRect rect, CGFloat radius);
extern void CGContextDrawLinearGradientBetweenPoints(CGContextRef context, CGPoint a, CGFloat color_a[4], CGPoint b, CGFloat color_b[4]);
+
+extern CGContextRef TUIGraphicsGetCurrentContext(void);
+extern void TUIGraphicsPushContext(CGContextRef context);
+extern void TUIGraphicsPopContext(void);
+
+extern TUIImage *TUIGraphicsContextGetImage(CGContextRef ctx);
+
+extern void TUIGraphicsBeginImageContext(CGSize size);
+extern void TUIGraphicsBeginImageContextWithOptions(CGSize size, BOOL opaque, CGFloat scale);
+extern TUIImage *TUIGraphicsGetImageFromCurrentImageContext(void);
+extern void TUIGraphicsEndImageContext(void);
+
+extern TUIImage *TUIGraphicsGetImageForView(TUIView *view);
+
+extern TUIImage *TUIGraphicsDrawAsImage(CGSize size, void(^draw)(void));
+
+/**
+ Draw drawing as a PDF
+ @param optionalMediaBox may be NULL
+ @returns NSData encapsulating the PDF drawing, suitable for writing to a file or the pasteboard
+ */
+extern NSData *TUIGraphicsDrawAsPDF(CGRect *optionalMediaBox, void(^draw)(CGContextRef));
View
88 lib/UIKit/TUICGAdditions.m
@@ -15,6 +15,8 @@
*/
#import "TUICGAdditions.h"
+#import "TUIImage.h"
+#import "TUIView.h"
CGContextRef TUICreateOpaqueGraphicsContext(CGSize size)
{
@@ -174,3 +176,89 @@ void CGContextDrawLinearGradientBetweenPoints(CGContextRef context, CGPoint a, C
CGColorSpaceRelease(colorspace);
CGGradientRelease(gradient);
}
+
+CGContextRef TUIGraphicsGetCurrentContext(void)
+{
+ return (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
+}
+
+void TUIGraphicsPushContext(CGContextRef context)
+{
+ NSGraphicsContext *c = [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO];
+ [NSGraphicsContext saveGraphicsState];
+ [NSGraphicsContext setCurrentContext:c];
+}
+
+void TUIGraphicsPopContext(void)
+{
+ [NSGraphicsContext restoreGraphicsState];
+}
+
+TUIImage* TUIGraphicsContextGetImage(CGContextRef ctx)
+{
+ CGImageRef CGImage = TUICreateCGImageFromBitmapContext(ctx);
+ TUIImage *image = [TUIImage imageWithCGImage:CGImage];
+ CGImageRelease(CGImage);
+
+ return image;
+}
+
+void TUIGraphicsBeginImageContextWithOptions(CGSize size, BOOL opaque, CGFloat scale)
+{
+ size.width *= scale;
+ size.height *= scale;
+ if(size.width < 1) size.width = 1;
+ if(size.height < 1) size.height = 1;
+ CGContextRef ctx = TUICreateGraphicsContextWithOptions(size, opaque);
+ TUIGraphicsPushContext(ctx);
+ CGContextRelease(ctx);
+}
+
+void TUIGraphicsBeginImageContext(CGSize size)
+{
+ TUIGraphicsBeginImageContextWithOptions(size, NO, 1.0f);
+}
+
+TUIImage* TUIGraphicsGetImageFromCurrentImageContext(void)
+{
+ return TUIGraphicsContextGetImage(TUIGraphicsGetCurrentContext());
+}
+
+TUIImage* TUIGraphicsGetImageForView(TUIView *view)
+{
+ TUIGraphicsBeginImageContext(view.frame.size);
+ [view.layer renderInContext:TUIGraphicsGetCurrentContext()];
+ TUIImage *image = TUIGraphicsGetImageFromCurrentImageContext();
+ TUIGraphicsEndImageContext();
+ return image;
+}
+
+void TUIGraphicsEndImageContext(void)
+{
+ TUIGraphicsPopContext();
+}
+
+TUIImage *TUIGraphicsDrawAsImage(CGSize size, void(^draw)(void))
+{
+ TUIGraphicsBeginImageContext(size);
+ draw();
+ TUIImage *image = TUIGraphicsGetImageFromCurrentImageContext();
+ TUIGraphicsEndImageContext();
+ return image;
+}
+
+NSData* TUIGraphicsDrawAsPDF(CGRect *optionalMediaBox, void(^draw)(CGContextRef))
+{
+ NSMutableData *data = [NSMutableData data];
+ CGDataConsumerRef dataConsumer = CGDataConsumerCreateWithCFData((__bridge CFMutableDataRef)data);
+ CGContextRef ctx = CGPDFContextCreate(dataConsumer, optionalMediaBox, NULL);
+ CGPDFContextBeginPage(ctx, NULL);
+ TUIGraphicsPushContext(ctx);
+ draw(ctx);
+ TUIGraphicsPopContext();
+ CGPDFContextEndPage(ctx);
+ CGPDFContextClose(ctx);
+ CGContextRelease(ctx);
+ CGDataConsumerRelease(dataConsumer);
+ return data;
+}
View
3  lib/UIKit/TUIColor.m
@@ -15,7 +15,8 @@
*/
#import "TUIColor.h"
-#import "TUIKit.h"
+#import "TUICGAdditions.h"
+#import "TUIImage.h"
@implementation TUIColor
View
3  lib/UIKit/TUIImage+Drawing.m
@@ -14,8 +14,9 @@
limitations under the License.
*/
-#import "TUIKit.h"
#import "TUIImage+Drawing.h"
+#import "TUICGAdditions.h"
+#import "TUIColor.h"
@implementation TUIImage (Drawing)
View
3  lib/UIKit/TUIImage.m
@@ -15,7 +15,8 @@
*/
#import "TUIImage.h"
-#import "TUIKit.h"
+#import "TUICGAdditions.h"
+#import "TUIView+Private.h"
static CGImageRef TUICreateImageRefWithData(NSData *data)
{
View
1  lib/UIKit/TUIImageView.m
@@ -14,7 +14,6 @@
limitations under the License.
*/
-#import "TUIKit.h"
#import "TUIImageView.h"
#import "TUIImage.h"
View
24 lib/UIKit/TUIKit.h
@@ -36,6 +36,8 @@
#import "TUILabel.h"
#import "TUILayoutConstraint.h"
#import "TUINSView.h"
+#import "TUINSView+Hyperfocus.h"
+#import "TUINSView+NSTextInputClient.h"
#import "TUINSWindow.h"
#import "TUIPopover.h"
#import "TUIProgressBar.h"
@@ -57,26 +59,4 @@
#import "TUIViewController.h"
#import "TUIViewNSViewContainer.h"
-extern CGContextRef TUIGraphicsGetCurrentContext(void);
-extern void TUIGraphicsPushContext(CGContextRef context);
-extern void TUIGraphicsPopContext(void);
-
-extern TUIImage *TUIGraphicsContextGetImage(CGContextRef ctx);
-
-extern void TUIGraphicsBeginImageContext(CGSize size);
-extern void TUIGraphicsBeginImageContextWithOptions(CGSize size, BOOL opaque, CGFloat scale);
-extern TUIImage *TUIGraphicsGetImageFromCurrentImageContext(void);
-extern void TUIGraphicsEndImageContext(void);
-
-extern TUIImage *TUIGraphicsGetImageForView(TUIView *view);
-
-extern TUIImage *TUIGraphicsDrawAsImage(CGSize size, void(^draw)(void));
-
-/**
- Draw drawing as a PDF
- @param optionalMediaBox may be NULL
- @returns NSData encapsulating the PDF drawing, suitable for writing to a file or the pasteboard
- */
-extern NSData *TUIGraphicsDrawAsPDF(CGRect *optionalMediaBox, void(^draw)(CGContextRef));
-
extern BOOL AtLeastLion; // set at launch
View
88 lib/UIKit/TUIKit.m
@@ -14,92 +14,4 @@
limitations under the License.
*/
-#import "TUIKit.h"
-
BOOL AtLeastLion = NO;
-
-CGContextRef TUIGraphicsGetCurrentContext(void)
-{
- return (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
-}
-
-void TUIGraphicsPushContext(CGContextRef context)
-{
- NSGraphicsContext *c = [NSGraphicsContext graphicsContextWithGraphicsPort:context flipped:NO];
- [NSGraphicsContext saveGraphicsState];
- [NSGraphicsContext setCurrentContext:c];
-}
-
-void TUIGraphicsPopContext(void)
-{
- [NSGraphicsContext restoreGraphicsState];
-}
-
-TUIImage* TUIGraphicsContextGetImage(CGContextRef ctx)
-{
- CGImageRef CGImage = TUICreateCGImageFromBitmapContext(ctx);
- TUIImage *image = [TUIImage imageWithCGImage:CGImage];
- CGImageRelease(CGImage);
-
- return image;
-}
-
-void TUIGraphicsBeginImageContextWithOptions(CGSize size, BOOL opaque, CGFloat scale)
-{
- size.width *= scale;
- size.height *= scale;
- if(size.width < 1) size.width = 1;
- if(size.height < 1) size.height = 1;
- CGContextRef ctx = TUICreateGraphicsContextWithOptions(size, opaque);
- TUIGraphicsPushContext(ctx);
- CGContextRelease(ctx);
-}
-
-void TUIGraphicsBeginImageContext(CGSize size)
-{
- TUIGraphicsBeginImageContextWithOptions(size, NO, 1.0f);
-}
-
-TUIImage* TUIGraphicsGetImageFromCurrentImageContext(void)
-{
- return TUIGraphicsContextGetImage(TUIGraphicsGetCurrentContext());
-}
-
-TUIImage* TUIGraphicsGetImageForView(TUIView *view)
-{
- TUIGraphicsBeginImageContext(view.frame.size);
- [view.layer renderInContext:TUIGraphicsGetCurrentContext()];
- TUIImage *image = TUIGraphicsGetImageFromCurrentImageContext();
- TUIGraphicsEndImageContext();
- return image;
-}
-
-void TUIGraphicsEndImageContext(void)
-{
- TUIGraphicsPopContext();
-}
-
-TUIImage *TUIGraphicsDrawAsImage(CGSize size, void(^draw)(void))
-{
- TUIGraphicsBeginImageContext(size);
- draw();
- TUIImage *image = TUIGraphicsGetImageFromCurrentImageContext();
- TUIGraphicsEndImageContext();
- return image;
-}
-
-NSData* TUIGraphicsDrawAsPDF(CGRect *optionalMediaBox, void(^draw)(CGContextRef))
-{
- NSMutableData *data = [NSMutableData data];
- CGDataConsumerRef dataConsumer = CGDataConsumerCreateWithCFData((__bridge CFMutableDataRef)data);
- CGContextRef ctx = CGPDFContextCreate(dataConsumer, optionalMediaBox, NULL);
- CGPDFContextBeginPage(ctx, NULL);
- TUIGraphicsPushContext(ctx);
- draw(ctx);
- TUIGraphicsPopContext();
- CGPDFContextEndPage(ctx);
- CGPDFContextClose(ctx);
- CGContextRelease(ctx);
- CGDataConsumerRelease(dataConsumer);
- return data;
-}
View
1  lib/UIKit/TUILabel.h
@@ -15,7 +15,6 @@
*/
#import "TUIView.h"
-#import "TUIStringDrawing.h"
#import "TUIAttributedString.h"
/*
View
4 lib/UIKit/TUILabel.m
@@ -15,9 +15,11 @@
*/
#import "TUILabel.h"
-#import "TUIFont.h"
#import "TUIColor.h"
+#import "TUIFont.h"
#import "TUINSView.h"
+#import "TUIStringDrawing.h"
+#import "TUITextRenderer.h"
#import "TUIView+Private.h"
@interface TUILabel ()
View
1  lib/UIKit/TUILayoutConstraint.m
@@ -1,5 +1,6 @@
#import "TUILayoutConstraint.h"
#import "TUILayoutManager.h"
+#import "TUIView.h"
@interface TUIView (Layout_Private)
View
3  lib/UIKit/TUILayoutManager.h
@@ -1,6 +1,5 @@
-#import "TUIView.h"
-
@class TUILayoutConstraint;
+@class TUIView;
/*
View
1  lib/UIKit/TUILayoutManager.m
@@ -1,4 +1,5 @@
#import <objc/runtime.h>
+#import "TUILayoutConstraint.h"
#import "TUILayoutManager.h"
#import "TUIView+Layout.h"
View
1  lib/UIKit/TUINSView+Hyperfocus.m
@@ -15,6 +15,7 @@
*/
#import "TUINSView.h"
+#import "TUICGAdditions.h"
#import "TUINSView+Hyperfocus.h"
@implementation TUINSView (Hyperfocus)
View
20 lib/UIKit/TUINSView+NSTextInputClient.h
@@ -0,0 +1,20 @@
+/*
+ Copyright 2011 Twitter, Inc.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this work except in compliance with the License.
+ You may obtain a copy of the License in the LICENSE file, or at:
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ 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.
+ */
+
+#import "TUINSView.h"
+
+@interface TUINSView (NSTextInputClient) <NSTextInputClient>
+@end
View
9 lib/UIKit/TUINSView+NSTextInputClient.m
@@ -14,7 +14,12 @@
limitations under the License.
*/
-#ifdef ENABLE_NSTEXT_INPUT_CLIENT
+#import "TUINSView+NSTextInputClient.h"
+#import "TUINSView+Private.h"
+#import "TUINSWindow.h"
+#import "TUITextRenderer.h"
+
+@implementation TUINSView (NSTextInputClient)
/*
This file is jank - TUITextRenderer and friends can shoulder this stuff
@@ -153,4 +158,4 @@ - (void)doCommandBySelector:(SEL)aSelector
[self tryToPerform:aSelector with:self];
}
-#endif
+@end
View
3  lib/UIKit/TUINSView+Private.h
@@ -34,4 +34,7 @@
*/
- (void)recalculateNSViewOrdering;
+- (TUIView *)viewForLocalPoint:(NSPoint)p;
+- (NSPoint)localPointForLocationInWindow:(NSPoint)locationInWindow;
+
@end
View
8 lib/UIKit/TUINSView.h
@@ -15,13 +15,15 @@
*/
#import <Cocoa/Cocoa.h>
+#import "TUIHostView.h"
#import "TUIView+TUIBridgedView.h"
-#import "TUIKit.h"
+
+@class TUITextRenderer;
/**
TUINSView is the bridge that hosts a TUIView-based interface heirarchy. You may add it as the contentView of your window if you want to build a pure TwUI-based UI, or you can use it for a small part.
*/
-@interface TUINSView : NSView <NSTextInputClient, TUIHostView>
+@interface TUINSView : NSView <TUIHostView>
{
TUIView *_hoverView;
@@ -65,5 +67,3 @@
- (BOOL)isWindowKey;
@end
-
-#import "TUINSView+Hyperfocus.h"
View
7 lib/UIKit/TUINSView.m
@@ -22,10 +22,11 @@
#import "CALayer+TUIExtensions.h"
#import "TUIBridgedScrollView.h"
#import "TUINSHostView.h"
+#import "TUINSView+Hyperfocus.h"
#import "TUINSView+Private.h"
#import "TUIViewNSViewContainer.h"
+#import "TUIView.h"
#import "TUIView+Private.h"
-#import "TUIView+TUIBridgedView.h"
#import "TUITextRenderer+Event.h"
#import "TUITooltipWindow.h"
#import <CoreFoundation/CoreFoundation.h>
@@ -663,10 +664,6 @@ - (void)didAddSubview:(NSView *)view {
[super didAddSubview:view];
}
-#define ENABLE_NSTEXT_INPUT_CLIENT
-#import "TUINSView+NSTextInputClient.m"
-#undef ENABLE_NSTEXT_INPUT_CLIENT
-
#pragma mark AppKit bridging
- (NSView *)hitTest:(NSPoint)point {
View
3  lib/UIKit/TUINSWindow.h
@@ -15,7 +15,8 @@
*/
#import <Cocoa/Cocoa.h>
-#import "TUINSView.h"
+
+@class TUINSView;
@interface NSWindow (TUIWindowAdditions)
View
3  lib/UIKit/TUINSWindow.m
@@ -15,6 +15,9 @@
*/
#import "TUINSWindow.h"
+#import "TUICGAdditions.h"
+#import "TUINSView.h"
+#import "TUINSView+Hyperfocus.h"
@interface NSView (TUIWindowAdditions)
@end
View
8 lib/UIKit/TUIPopover.m
@@ -15,13 +15,13 @@
*/
#import "TUIPopover.h"
+#import "CAAnimation+TUIExtensions.h"
+#import "TUICGAdditions.h"
+#import "TUIColor.h"
+#import "TUINSView.h"
#import "TUINSWindow.h"
#import "TUIViewController.h"
-#import "CAAnimation+TUIExtensions.h"
-
-//#import "GHUICoreGraphics.h"
-
//***************************************************************************
@interface TUIPopoverBackgroundView ()
View
3  lib/UIKit/TUIProgressBar.m
@@ -14,9 +14,10 @@
limitations under the License.
*/
-#import "TUIKit.h"
#import "TUIProgressBar.h"
#import "CAAnimation+TUIExtensions.h"
+#import "TUICGAdditions.h"
+#import "TUIColor.h"
NSString *GHUIProgressBarSetNeedsDisplayObservationContext = @"GHUIProgressBarSetNeedsDisplayObservationContext";
View
4 lib/UIKit/TUIScrollKnob.m
@@ -14,9 +14,9 @@
limitations under the License.
*/
-#import "TUIKit.h"
-
#import "TUIScrollKnob.h"
+#import "TUICGAdditions.h"
+#import "TUIColor.h"
#import "TUIScrollView.h"
@interface TUIScrollKnob ()
View
3  lib/UIKit/TUIScrollView.m
@@ -15,9 +15,10 @@
*/
#import "TUIScrollView.h"
+#import "TUIKit.h"
+#import "TUINSView.h"
#import "TUIScrollKnob.h"
#import "TUIView+Private.h"
-#import "TUINSView.h"
#define KNOB_Z_POSITION 6000
View
6 lib/UIKit/TUIStringDrawing.m
@@ -15,11 +15,11 @@
*/
#import "TUIAttributedString.h"
-#import "TUIStringDrawing.h"
-#import "TUITextRenderer.h"
+#import "TUICGAdditions.h"
#import "TUIColor.h"
#import "TUIFont.h"
-#import "TUIKit.h"
+#import "TUIStringDrawing.h"
+#import "TUITextRenderer.h"
@implementation NSAttributedString (TUIStringDrawing)
View
6 lib/UIKit/TUIStyledView.m
@@ -7,12 +7,12 @@
//
#import "TUIStyledView.h"
-#import "TUIKit.h"
-
+#import "TUICGAdditions.h"
+#import "TUIColor.h"
+#import "TUITextRenderer.h"
@implementation TUIStyledView
-
#pragma mark TUIView
- (void)drawRect:(CGRect)rect {
View
1  lib/UIKit/TUITableView+Cell.m
@@ -15,6 +15,7 @@
*/
#import "TUITableView+Cell.h"
+#import "TUIFastIndexPath.h"
// Dragged cells should be just above pinned headers
#define kTUITableViewDraggedCellZPosition 1001
View
3  lib/UIKit/TUITableView.h
@@ -15,7 +15,8 @@
*/
#import "TUIScrollView.h"
-#import "TUIFastIndexPath.h"
+
+@class TUIFastIndexPath;
typedef enum {
TUITableViewStylePlain, // regular table view
View
4 lib/UIKit/TUITableView.m
@@ -15,9 +15,11 @@
*/
#import "TUITableView.h"
+#import "TUIFastIndexPath.h"
+#import "TUINSView.h"
+#import "TUINSWindow.h"
#import "TUITableView+Cell.h"
#import "TUITableViewSectionHeader.h"
-#import "TUINSView.h"
// header views need to be above the cells at all times
#define HEADER_Z_POSITION 1000
View
3  lib/UIKit/TUITableViewCell.h
@@ -15,7 +15,8 @@
*/
#import "TUIView.h"
-#import "TUIFastIndexPath.h"
+
+@class TUIFastIndexPath;
typedef enum {
TUITableViewCellStyleDefault,
View
5 lib/UIKit/TUITableViewCell.m
@@ -15,9 +15,10 @@
*/
#import "TUITableViewCell.h"
-#import "TUITableView.h"
-#import "TUITableView+Cell.h"
+#import "TUIFastIndexPath.h"
#import "TUINSWindow.h"
+#import "TUITableView+Cell.h"
+#import "TUITableView.h"
@implementation TUITableViewCell
View
4 lib/UIKit/TUITextEditor.m
@@ -14,8 +14,10 @@
limitations under the License.
*/
-#import "TUIKit.h"
#import "TUITextEditor.h"
+#import "TUINSView.h"
+#import "TUINSWindow.h"
+#import "TUIView.h"
@implementation TUITextEditor
View
3  lib/UIKit/TUITextField.m
@@ -14,8 +14,9 @@
limitations under the License.
*/
-#import "TUIKit.h"
#import "TUITextField.h"
+#import "TUIButton.h"
+#import "TUIImage.h"
#import "TUITextViewEditor.h"
@interface TUITextFieldEditor : TUITextViewEditor
View
10 lib/UIKit/TUITextRenderer+Event.m
@@ -15,10 +15,14 @@
*/
#import "TUITextRenderer+Event.h"
-#import "TUIView.h"
-#import "TUIView+Private.h"
+#import "ABActiveRange.h"
#import "CoreText+Additions.h"
-#import "TUIKit.h"
+#import "TUICGAdditions.h"
+#import "TUIImage.h"
+#import "TUINSView.h"
+#import "TUINSWindow.h"
+#import "TUIView+Private.h"
+#import "TUIView.h"
@interface TUITextRenderer()
- (CTFramesetterRef)ctFramesetter;
View
2  lib/UIKit/TUITextRenderer.h
@@ -15,12 +15,12 @@
*/
#import "TUIResponder.h"
-#import "ABActiveRange.h"
#import "CoreText+Additions.h"
@class TUIColor;
@class TUIFont;
@class TUIView;
+@protocol ABActiveTextRange;
typedef enum {
TUITextSelectionAffinityCharacter = 0,
View
11 lib/UIKit/TUITextRenderer.m
@@ -15,11 +15,14 @@
*/
#import "TUITextRenderer.h"
-#import "TUITextRenderer+Event.h"
-#import "TUIFont.h"
+#import "ABActiveRange.h"
+#import "TUIAttributedString.h"
+#import "TUICGAdditions.h"
#import "TUIColor.h"
-#import "TUIKit.h"
-#import "CoreText+Additions.h"
+#import "TUIFont.h"
+#import "TUIStringDrawing.h"
+#import "TUITextRenderer+Event.h"
+#import "TUIView.h"
@interface TUITextRenderer ()
@property (nonatomic, retain) NSMutableDictionary *lineRects;
View
6 lib/UIKit/TUITextView.m
@@ -14,8 +14,12 @@
limitations under the License.
*/
-#import "TUIKit.h"
#import "TUITextView.h"
+#import "TUICGAdditions.h"
+#import "TUIColor.h"
+#import "TUIFont.h"
+#import "TUINSView.h"
+#import "TUINSWindow.h"
#import "TUITextViewEditor.h"
#import "TUITextRenderer+Event.h"
View
5 lib/UIKit/TUITooltipWindow.m
@@ -15,7 +15,10 @@
*/
#import "TUITooltipWindow.h"
-#import "TUIKit.h"
+#import "TUIAttributedString.h"
+#import "TUICGAdditions.h"
+#import "TUIFont.h"
+#import "TUIStringDrawing.h"
#define TOOLTIP_HEIGHT 18
#define SWITCH_DELAY 0.2
View
9 lib/UIKit/TUIView+Event.m
@@ -15,12 +15,13 @@
*/
#import "TUIView.h"
-#import "TUIView+Event.h"
-#import "TUITextRenderer.h"
+#import "TUINSView.h"
+#import "TUINSWindow.h"
#import "TUITextRenderer+Event.h"
-#import "TUIView+Private.h"
+#import "TUITextRenderer.h"
+#import "TUIView+Event.h"
#import "TUIView+PasteboardDragging.h"
-#import "TUINSWindow.h"
+#import "TUIView+Private.h"
@implementation TUIView (Event)
View
4 lib/UIKit/TUIView+Layout.h
@@ -1,5 +1,7 @@
#import <Cocoa/Cocoa.h>
-#import "TUILayoutConstraint.h"
+#import "TUIView.h"
+
+@class TUILayoutConstraint;
/*
View
1  lib/UIKit/TUIView+Layout.m
@@ -1,4 +1,5 @@
#import "TUIView.h"
+#import "TUILayoutConstraint.h"
#import "TUILayoutManager.h"
#define TUIScalarRect(_s) (NSMakeRect((_s), 0, 0, 0))
View
2  lib/UIKit/TUIView+PasteboardDragging.h
@@ -14,7 +14,7 @@
limitations under the License.
*/
-@class TUIView;
+#import "TUIView.h"
@interface TUIView (PasteboardDragging)
View
4 lib/UIKit/TUIView+PasteboardDragging.m
@@ -14,8 +14,10 @@
limitations under the License.
*/
-#import "TUIKit.h"
#import "TUIView+PasteboardDragging.h"
+#import "TUICGAdditions.h"
+#import "TUIImage.h"
+#import "TUINSView.h"
@implementation TUIView (PasteboardDragging)
View
3  lib/UIKit/TUIView+Private.h
@@ -15,7 +15,8 @@
*/
#import "TUIView.h"
-#import "TUITextRenderer.h"
+
+@class TUITextRenderer;
@interface TUIView ()
@property (nonatomic, retain) NSArray *textRenderers;
View
4 lib/UIKit/TUIView.h
@@ -15,7 +15,6 @@
*/
#import "TUIResponder.h"
-#import "TUIColor.h"
#import "TUIAccessibility.h"
extern NSString * const TUIViewWillMoveToWindowNotification; // both notification's userInfo will contain the new window under the key TUIViewWindow
@@ -62,9 +61,10 @@ typedef enum {
TUIViewContentModeScaleAspectFill,
} TUIViewContentMode;
-@class TUIView;
+@class TUIColor;
@class TUINSView;
@class TUINSWindow;
+@class TUIView;
typedef void(^TUIViewDrawRect)(TUIView *, CGRect);
typedef CGRect(^TUIViewLayout)(TUIView *);
View
6 lib/UIKit/TUIView.m
@@ -14,13 +14,17 @@
limitations under the License.
*/
+#import "TUIView.h"
#import <pthread.h>
+#import "TUICGAdditions.h"
+#import "TUIColor.h"
+#import "TUIImage.h"
#import "TUILayoutManager.h"
+#import "TUINSView.h"
#import "TUINSWindow.h"
#import "TUITextRenderer.h"
#import "TUIView+Private.h"
#import "TUIView+TUIBridgedView.h"
-#import "TUIView.h"
#import "TUIViewController.h"
/*
View
3  lib/UIKit/TUIViewController.h
@@ -14,9 +14,10 @@
limitations under the License.
*/
-#import "TUIView.h"
+#import "TUIResponder.h"
@class TUINavigationItem;
+@class TUIView;
@interface TUIViewController : TUIResponder <NSCopying>
{
View
2  lib/UIKit/TUIViewController.m
@@ -15,6 +15,8 @@
*/
#import "TUIViewController.h"
+#import "TUIColor.h"
+#import "TUIView.h"
@implementation TUIViewController
Please sign in to comment.
Something went wrong with that request. Please try again.