Permalink
Browse files

Merge remote-tracking branch 'origin/dev'

Conflicts:
	ExampleProject/ConcordeExample/main.m
	README.md
  • Loading branch information...
2 parents 0d03e1a + 74dc2a5 commit 0a61d4b648d0d759fc0d652ef763f8a43106e86f @jspahrsummers jspahrsummers committed Jul 19, 2012
Showing with 1,574 additions and 117 deletions.
  1. +1 −1 ExampleProject/ConcordeExample/ExampleAppDelegate.m
  2. +2 −2 ExampleProject/ConcordeExample/ExampleView.m
  3. BIN ExampleProject/ConcordeExample/clock@2x.png
  4. +1 −1 ExampleProject/ConcordeExample/main.m
  5. +4 −0 ExampleProject/Example.xcodeproj/project.pbxproj
  6. +3 −4 README.md
  7. +67 −1 TwUI.xcodeproj/project.pbxproj
  8. +1 −0 lib/UIKit/TUIAttributedString.h
  9. +12 −0 lib/UIKit/TUIAttributedString.m
  10. +3 −0 lib/UIKit/TUIButton.h
  11. +39 −2 lib/UIKit/TUIButton.m
  12. +15 −0 lib/UIKit/TUICGAdditions.h
  13. +45 −13 lib/UIKit/TUICGAdditions.m
  14. +2 −0 lib/UIKit/TUIControl.h
  15. +12 −0 lib/UIKit/TUIControl.m
  16. +1 −1 lib/UIKit/TUIFastIndexPath.m
  17. +1 −3 lib/UIKit/TUIImage.h
  18. +163 −75 lib/UIKit/TUIImage.m
  19. +4 −0 lib/UIKit/TUIImageView.m
  20. +2 −0 lib/UIKit/TUIKit.h
  21. +61 −0 lib/UIKit/TUILayoutConstraint.h
  22. +142 −0 lib/UIKit/TUILayoutConstraint.m
  23. +20 −0 lib/UIKit/TUILayoutManager.h
  24. +201 −0 lib/UIKit/TUILayoutManager.m
  25. +3 −3 lib/UIKit/TUINSView.m
  26. +2 −2 lib/UIKit/TUIPopover.m
  27. +38 −0 lib/UIKit/TUIProgressBar.h
  28. +366 −0 lib/UIKit/TUIProgressBar.m
  29. +2 −2 lib/UIKit/TUIScrollView.m
  30. +17 −0 lib/UIKit/TUIStyledView.h
  31. +41 −0 lib/UIKit/TUIStyledView.m
  32. +1 −1 lib/UIKit/TUITextField.m
  33. +5 −0 lib/UIKit/TUITextRenderer.m
  34. +1 −0 lib/UIKit/TUITextView.h
  35. +43 −0 lib/UIKit/TUITextView.m
  36. +14 −0 lib/UIKit/TUIView+Layout.h
  37. +197 −0 lib/UIKit/TUIView+Layout.m
  38. +2 −0 lib/UIKit/TUIView+Private.h
  39. +2 −4 lib/UIKit/TUIView+Private.m
  40. +3 −1 lib/UIKit/TUIView.h
  41. +35 −1 lib/UIKit/TUIView.m
@@ -52,7 +52,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
tuiScrollViewContainer.rootView = scrollExample;
[self showTableViewExampleWindow:nil];
-
+
}
/**
@@ -134,7 +134,7 @@ - (CGFloat)tableView:(TUITableView *)tableView heightForRowAtIndexPath:(TUIFastI
- (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", section]];
+ TUIAttributedString *title = [TUIAttributedString stringWithString:[NSString stringWithFormat:@"Example Section %d", (int)section]];
title.color = [TUIColor blackColor];
title.font = exampleFont2;
view.labelRenderer.attributedString = title;
@@ -145,7 +145,7 @@ - (TUITableViewCell *)tableView:(TUITableView *)tableView cellForRowAtIndexPath:
{
ExampleTableViewCell *cell = reusableTableCellOfClass(tableView, ExampleTableViewCell);
- TUIAttributedString *s = [TUIAttributedString stringWithString:[NSString stringWithFormat:@"example cell %d", indexPath.row]];
+ TUIAttributedString *s = [TUIAttributedString stringWithString:[NSString stringWithFormat:@"example cell %d", (int)indexPath.row]];
s.color = [TUIColor blackColor];
s.font = exampleFont1;
[s setFont:exampleFont2 inRange:NSMakeRange(8, 4)]; // make the word "cell" bold
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -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);
}
@@ -13,6 +13,7 @@
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 */; };
@@ -73,6 +74,7 @@
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; };
@@ -173,6 +175,7 @@
isa = PBXGroup;
children = (
D3EC0C481432325A003C162C /* large-image.jpeg */,
+ 5E8A28C71590CB34000D5D2B /* clock@2x.png */,
5C57CF3C13A7E7C00032AC1F /* clock.png */,
5ED5667F139DC30300031CDF /* Example-Info.plist */,
5ED56680139DC30300031CDF /* InfoPlist.strings */,
@@ -287,6 +290,7 @@
5ED5668E139DC30300031CDF /* MainMenu.xib in Resources */,
5C57CF3D13A7E7C00032AC1F /* clock.png in Resources */,
D3EC0C4A1432325A003C162C /* large-image.jpeg in Resources */,
+ 5E8A28C81590CB34000D5D2B /* clock@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
View
@@ -1,4 +1,4 @@
-# TwUI 0.2.0
+# TwUI 0.2.0r1
TwUI is a hardware accelerated UI framework for Mac, inspired by UIKit. It enables:
@@ -11,6 +11,7 @@ It differs from UIKit in a few ways:
* Block-based layout and drawRect
* A consistent coordinate system (bottom left origin)
* Sub-pixel text rendering
+* Layout Constraints (ala Cocoa Auto-Layout)
# Setup
@@ -26,7 +27,7 @@ An included example project shows off the basic construction of a pure TwUI-base
# Status
-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.
+TwUI should be considered an alpha project. It is current shipping in Twitter for Mac and Github for Mac, in use 24/7 by many, many users and has proven itself very stable.
This project follows the [SemVer](http://semver.org/) standard. The API may change in backwards-incompatible ways before the 1.0 release.
@@ -40,8 +41,6 @@ There are many places where TwUI could be improved:
* 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.
-* 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.
-
# Documentation
You can generate documentation with [doxygen](http://www.doxygen.org). Install it, and then run:
Oops, something went wrong.

0 comments on commit 0a61d4b

Please sign in to comment.