Skip to content


Subversion checkout URL

You can clone with
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mralexgray/twui
head fork: mralexgray/twui
This comparison is big! We’re only showing the most recent 250 commits
Commits on Oct 14, 2012
@avaidyam avaidyam Indicator layer proxy and constraints update. 25b5499
@avaidyam avaidyam Fixed hidesWhenStopped and the example code. c82c690
@avaidyam avaidyam Added protocol cast to TUIBridgedScrollView. 49415e0
@avaidyam avaidyam Stick to TUIBridgedScrollView methods only. 719927d
@avaidyam avaidyam Convert TUIScrollKnob to a pretty TUIScroller. 5d58a3b
@avaidyam avaidyam TUIScroller now expands on mouse over. 25001b9
@avaidyam avaidyam Add knob border colors and change colors for indicator style. 156248a
@avaidyam avaidyam ScrollKnob -> Scroller (Matches AppKit) 1c9d122
@avaidyam avaidyam TUIScroller animations + 10.8 checks. a068cd5
Commits on Oct 15, 2012
@avaidyam avaidyam Style fixes and refactoring. 8d7be3f
@avaidyam avaidyam Shuffled things around, to begin removing them. 1a4ab35
@avaidyam avaidyam Fixed imports and casting. 19fc9e0
@jspahrsummers jspahrsummers Merge remote-tracking branch 'galaxas0/upstream-text-autoscroll' (pul…
…l request #88)
@avaidyam avaidyam Name changes. 310574e
@avaidyam avaidyam Updated indicator API to make it clear that they're accessors to the …
…inner indicator view.

I swear I can count the number of lines of code that this stuff takes
@avaidyam avaidyam Shift stuff around. 3007fb9
@avaidyam avaidyam Keep it simple. a176984
@avaidyam avaidyam More visually appealing demo. faac0f8
Commits on Oct 17, 2012
@avaidyam avaidyam Export gradient cell drawing out of API into a custom block.
No alternated gradient or fallback support yet.
@avaidyam avaidyam Fix documentation. 4372f9e
@avaidyam avaidyam Add alternated gradients and fallback drawing. bbab47c
@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' into upstream-tablevie…
@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' into upstream-ML-scrol…

@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' into upstream-activity…
@avaidyam avaidyam Remove macro. b25704f
Commits on Oct 18, 2012
@avaidyam avaidyam Removed gradient drawing.
@avaidyam avaidyam Added TUITableViewController. 232e863
@avaidyam avaidyam Added documentation. c4c7a14
@avaidyam avaidyam Added to header. 32e750e
@avaidyam avaidyam Creepy TUIViewController caused bug fix. 1e3d730
@avaidyam avaidyam Lazy-loaded table view frame init. 91d5d2d
@luosheng luosheng Remove target actions. b9a4846
@jspahrsummers jspahrsummers Merge remote-tracking branch 'luosheng/master' (pull request #116) 93274e5
@avaidyam avaidyam Style fixes. 7aa1ad0
@avaidyam avaidyam Fixed alternated colors. 12eaffc
@jspahrsummers jspahrsummers Merge remote-tracking branch 'galaxas0/upstream-tableview-controller'…
… (pull request #115)
@avaidyam avaidyam Short circuit same-value setting. 8d2aa9c
@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' into upstream-tablevie…

@avaidyam avaidyam Remove extraneous API features. 792f45e
Commits on Oct 19, 2012
@jspahrsummers jspahrsummers Merge remote-tracking branch 'galaxas0/upstream-tableviewcell-additio…
…ns' (pull request #106)
@avaidyam avaidyam Fix scroller outline. Switched to shadow from border. c3edfa0
@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' into upstream-ML-scrol…
@avaidyam avaidyam Fixed animation glitches. 935c46e
@avaidyam avaidyam Fixed scroller jumping. 4d31590
@avaidyam avaidyam Fixed extraneous flashing scrollers. 0b7e42e
@jagreenwood jagreenwood Added TUIScrollView delegate method scrollViewDidEndDecelerating: e35f7e5
@jwilling jwilling Merge pull request #122 from jagreenwood/tuiscrollview-delegate-scrol…

Added TUIScrollView delegate method scrollViewDidEndDecelerating:
@jwilling jwilling swap out timer with display link for scrolling 87811f5
@jwilling jwilling convert all spaces to tabs 44b1a23
@jwilling jwilling improve indentation and casting 4e7781e
@jwilling jwilling we weren't even using the argument d396368
@jwilling jwilling display link all the things fc3ffe3
@jspahrsummers jspahrsummers Merge remote-tracking branch 'origin/CVDisplayLink-scroll-view' (pull…
… request #123)
@avaidyam avaidyam Don't allow both expanded tracks to expand at once. is a good example. Try playing with both tracks and one of
them hides, when the other is shown right after.
@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' into upstream-ML-scrol…

Commits on Oct 23, 2012
@luosheng luosheng When the window will close, set appkit host view's layout manager to …
@jspahrsummers jspahrsummers Convert autoscrolling rects to the scroll view's coordinate system ed019f5
@luosheng luosheng Use the existing notification handler to avoid introducing a new one. cd14f20
@jspahrsummers jspahrsummers Merge pull request #127 from luosheng/master
Fix TUINSView not being deallocated
Commits on Oct 24, 2012
@jspahrsummers jspahrsummers Typo fix 5f81574
Danny Greg Merge pull request #128 from github/fix-text-scrolling-coordinates
Convert TUITextRenderer autoscrolling rects to the scroll view's coordinate system
Commits on Oct 25, 2012
@avaidyam avaidyam Clean up TUIButton. b2dc5af
@avaidyam avaidyam Add TUIButtonTypeStandard support.
Mimics the popover buttons. Simple.
Commits on Oct 26, 2012
@avaidyam avaidyam Added TUIButtonTypeBeveled.
And a few additional drawing facilities for the rest of the button
@avaidyam avaidyam Added TUIButtonTypeEmbossed and TUIButtonTypeGradient. e41c1f5
@avaidyam avaidyam Added TUIButtonTypeMinimal and TUIButtonTypeInline. d7fc440
@avaidyam avaidyam A few fixes and changes. c456fde
@avaidyam avaidyam Added better examples of the buttons. 8dec39b
@avaidyam avaidyam Fixed many odd bugs. 0627a60
@avaidyam avaidyam Rename and reorder stuff. a8d01c7
@avaidyam avaidyam Fix the scroller positioning and animation issues.
Anchor the scroller and set its position without animation first.
Make sure the scroller's rect isn't below/above the track.
Commits on Oct 31, 2012
@avaidyam avaidyam Fix improper scroller positioning and scroller seizures. bd490a2
@avaidyam avaidyam Add knob inset to center scroller and use window keyedness to allow e…
@jspahrsummers jspahrsummers Expose TUINSView->_trackingView as a property 36636a7
@jspahrsummers jspahrsummers Claer TUINSView.trackingView when it's deallocated 9f21fa7
@jspahrsummers jspahrsummers Remove _trackingView explicit ivar c6a7ad9
@jspahrsummers jspahrsummers Spaces -> tabs ca9c74f
@jspahrsummers jspahrsummers Fix comment style 7e01c96
@jwilling jwilling Merge pull request #131 from github/tracking-view-memory-management
Fix TUINSView trackingView memory management
Commits on Nov 01, 2012
@avaidyam avaidyam Change scroller display duration. 4d2c424
@jspahrsummers jspahrsummers Actually default separatorStyle to what it's documented to be 7b76c24
Danny Greg Merge pull request #132 from github/table-cell-separator-style
Actually default TUITableViewCell.separatorStyle to what it's documented to be
Commits on Nov 03, 2012
@avaidyam avaidyam Don't animate a scroller shrink. d003d05
@CodaFi CodaFi Fixed weakSelf issues 5eebc63
@CodaFi CodaFi Refactored out weakSelf e94e0c2
@CodaFi CodaFi Cast pointer to id. Run a re-indent on the file. fbbcee5
@CodaFi CodaFi Removed Odd Backup Files fa714d0
Commits on Nov 09, 2012
@avaidyam avaidyam Style fixes and fixed animation direction. eedc609
@jspahrsummers jspahrsummers Merge pull request #108 from galaxas0/upstream-activity-indicator
TUIActivityIndicator Revamp!
@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' into upstream-ML-scrol…
@avaidyam avaidyam Working overscroll rubber banding! 1a8d7b8
@avaidyam avaidyam Fixed overscroll on bottom/left edges and scroller jumps. Should look…
… better on Retina (I think!)
@jagreenwood jagreenwood Added support for a table footer view 06c0530
Commits on Nov 10, 2012
@jagreenwood jagreenwood Deleted ivar declarations for headerView and footerView. Using footVi…
…ew property instead of ivar.
@jagreenwood jagreenwood Deleted @synthesis headerView. Using headerView property instead of i…
…var. Made headerView hide code consistent with footerView's.
@jagreenwood jagreenwood Added footView to Example project table 58aa03c
@jwilling jwilling Merge pull request #134 from jagreenwood/table-footer
Added support for a TUITableView footer view
@avaidyam avaidyam Fixed scroller position and don't hide knob if scroll view is tracking. 9dbdef2
@avaidyam avaidyam Style fixes. e8a122f
@avaidyam avaidyam Style fixes for the rest of the class. 2c86104
@jwilling jwilling Merge pull request #109 from galaxas0/upstream-ML-scrollbars
Mountain Lion Scrollers
@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' into upstream-button-a…

Commits on Nov 13, 2012
@maxgoedjen maxgoedjen Adding TUINavigationController. b77b68c
@maxgoedjen maxgoedjen Less hacky way of making sure pushes don't pop in. 85bcd64
@maxgoedjen maxgoedjen Removed unused constant. 1141866
Commits on Nov 14, 2012
@maxgoedjen maxgoedjen Various improvements as suggested by @galaxas0 and @CodaFi b566f85
@maxgoedjen maxgoedjen Fixed return type on popViewContorllerAniamted: 9ffacfb
@maxgoedjen maxgoedjen Removed exception in favor of log 542c669
@maxgoedjen maxgoedjen Improved setViewControllers:animated: 94bd5b3
@maxgoedjen maxgoedjen Switching to static c functions for offscreen frames 6bbde5f
@maxgoedjen maxgoedjen Inlined 4f643f3
@maxgoedjen maxgoedjen Spaces -> tabs f12e14d
@maxgoedjen maxgoedjen Merge upstream/master 4945abc
@CodaFi CodaFi Merge pull request #136 from maxgoedjen/feature-tuinavigationcontroller
Adding TUINavigationController
@maxgoedjen maxgoedjen Blocks + delegate! e87e1b2
@maxgoedjen maxgoedjen Adding navigationController property to TUIViewController. 97d8ba3
@maxgoedjen maxgoedjen Updated example project for TUINavigationController, plus some refact…
…oring to the project in general.
@maxgoedjen maxgoedjen retain -> strong. e3b40df
@maxgoedjen maxgoedjen Removing spacing. 3fdd1b8
@maxgoedjen maxgoedjen view -> header. d59e608
@maxgoedjen maxgoedjen Fixed true/false. 808e08d
@maxgoedjen maxgoedjen weak -> unsafe_unretained 693121c
@maxgoedjen maxgoedjen New subscript syntax. bc1e0c0
@maxgoedjen maxgoedjen Syntax cleanup. b39c61a
@maxgoedjen maxgoedjen NSFont niceties, switching to constraint based layout. 1992b9e
@maxgoedjen maxgoedjen Fixed fonts. 8bd4b5a
@maxgoedjen maxgoedjen STRENGTH. b5695a1
@maxgoedjen maxgoedjen Changing timing on push/pop. d36edc3
@maxgoedjen maxgoedjen controler -> controller. f82b8ba
@maxgoedjen maxgoedjen Wrapping ternarys. 3c5e032
@maxgoedjen maxgoedjen Undid accidental comment. 2b6a888
@maxgoedjen maxgoedjen Fixed bug where scroll view would crash if popped rapidly. 01114c5
@maxgoedjen maxgoedjen Fixed bug where TUIScroller would crash under certain circumstances. f2f97f5
@cHoco cHoco Fix TUIActivityIndicatorView glitch
Instead of translating over and over again we start fresh everytime
@jwilling jwilling Merge pull request #141 from cHoco/fix-TUIActivityIndicatorView-glitch
Fix TUIActivityIndicatorView glitch
@maxgoedjen maxgoedjen Removed setupStandardView as per @CodaFi's request. ab979a1
@CodaFi CodaFi Merge remote-tracking branch 'upstream/master' into fix-tuipopover-bl…

Merge upstream
Commits on Nov 15, 2012
@CodaFi CodaFi Updated indentation in TUIPopover b4418d3
@CodaFi CodaFi Merge pull request #140 from maxgoedjen/feature-navcontroller-improve…

TUINavigationController Enhancements
@CodaFi CodaFi Indentation and brace changes 31c9842
@CodaFi CodaFi Merge remote-tracking branch 'upstream/master' into fix-tuipopover-bl…

Merge Upstream/Master
@jspahrsummers jspahrsummers Adding CONTRIBUTING file c0b4d61
@jspahrsummers jspahrsummers TwUI-specific tweaks describing framework focus 8e4c4bb
@jspahrsummers jspahrsummers Remove Contributing section from README 1670656
@CodaFi CodaFi Re-typed cast 486c25a
Commits on Nov 16, 2012
@jwilling jwilling Merge pull request #142 from github/contributing
@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' into upstream-button-a…

Commits on Nov 17, 2012
@CodaFi CodaFi Retyped cast (again) 658c862
@avaidyam avaidyam Button cleanup. da4f31e
@avaidyam avaidyam Fixed control state changes. 58122cd
@avaidyam avaidyam Cleaned up TUIControl. 4a630fe
@avaidyam avaidyam TUIButton and TUIControl documentation. 23c33ae
@avaidyam avaidyam Added NSBezierPath, NSShadow, NSCoder, NSValue extensions.
NSBezierPath - new extension.
NSShadow - pulled out from TUIAttributedString.
NSCoder and NSValue - support extensions.
Commits on Nov 18, 2012
@jspahrsummers jspahrsummers Merge pull request #133 from github/fix-tuipopover-block-retain-cycles
Fixed weakSelf issues
@avaidyam avaidyam Refactored, reorganized, and restyled extensions. 2a9aac0
@avaidyam avaidyam Added relevant licenses. e1c109f
@avaidyam avaidyam Style fixes and simplification (CG stucts are synonymous with NS stru…
@avaidyam avaidyam Fix LICENSE file. 89df335
Commits on Nov 19, 2012
@avaidyam avaidyam Isolated TUIEdgeInsets and added NSAffineTransform to CGAffineTransfo…
…rm conversion.

Style fixes too.
Commits on Nov 20, 2012
@avaidyam avaidyam Switch to declarative enum syntax, for similar backing types. ca806e4
@avaidyam avaidyam Style fixes and code cleanup. e17f9f9
@jspahrsummers jspahrsummers Merge pull request #144 from galaxas0/upstream-extensions
Added NSBezierPath, NSShadow, NSAffineTransform extensions.
Commits on Nov 21, 2012
@avaidyam avaidyam Fix TUIControl's tracking methods. 9a14720
@avaidyam avaidyam Add basic touch event support for TUIView. 435fa60
@avaidyam avaidyam Add an internal NSTouch -> TUIView forwarding chain. d861fa3
@avaidyam avaidyam Allow TUIScrollView to highlight scroller if tracked. e2c2abe
@avaidyam avaidyam Intelligently forward touch acceptance events up the view heirarchy. 0402992
Commits on Nov 22, 2012
@avaidyam avaidyam Add a better example. 5140fbb
Commits on Nov 28, 2012
@avaidyam avaidyam Add TUIButtonTypeClear. 71d83ed
@avaidyam avaidyam quick! 6876a3c
@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' into upstream-button-a…

@avaidyam avaidyam Better example. c06983e
Commits on Nov 30, 2012
@avaidyam avaidyam Clean up Example project. f69ad64
Commits on Dec 03, 2012
@avaidyam avaidyam Fix example project. 35ef7ed
Commits on Dec 07, 2012
@avaidyam avaidyam Style fixes. 9f0fd10
Commits on Dec 10, 2012
@jwilling jwilling fix reference cycle in certain cases 03929a8
Commits on Dec 11, 2012
Danny Greg Merge pull request #148 from github/fix-tuipopover-cycle
Fix reference cycle in TUIPopover
Commits on Dec 15, 2012
@avaidyam avaidyam Switch to CoreUI-automated drawing.
This stays consistent with system controls and OS version as well.
@avaidyam avaidyam Highly efficient shared button renderer. 7398ca9
@avaidyam avaidyam Added concise and thorough button documentation. fa6de79
@avaidyam avaidyam Reverted unneccessary changes. a53ebc0
@avaidyam avaidyam Cleaned up the Example project. 5a01827
@avaidyam avaidyam Update and integrate TUIControl with better documentation. 109c525
@avaidyam avaidyam Style fixes for TUIControl. cacaf3e
Commits on Dec 17, 2012
@avaidyam avaidyam Added relative image-text positioning (to all controls, but implement…
…ed in TUIButton).
Commits on Dec 19, 2012
@avaidyam avaidyam Button fixes. eabdf66
@avaidyam avaidyam Image drawing updates. 49bef4e
@avaidyam avaidyam Improved drawing refactoring. f6b385a
Commits on Dec 20, 2012
@avaidyam avaidyam TUISlider 60863ac
@avaidyam avaidyam API completion and parity. 54b4fb9
Commits on Dec 21, 2012
@avaidyam avaidyam Documentation and Style fixes. 58bcdf5
@avaidyam avaidyam Update hover and periodic delay. 35a16ad
@avaidyam avaidyam A few more style fixes. d727920
@jwilling jwilling Merge pull request #150 from galaxas0/upstream-control-updates
Update and integrate TUIControl with better documentation.
@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' into upstream-button-a…

@avaidyam avaidyam Clean up fixes. 0354a6b
@jspahrsummers jspahrsummers Feature freeze 5d6a8db
@jspahrsummers jspahrsummers Link to Rebel blog post as an explanation for the freeze cda0a7c
@jspahrsummers jspahrsummers Reference the network graph in the README dad5c40
@joshaber joshaber Merge pull request #152 from github/feature-freeze
Feature freeze
Commits on Dec 22, 2012
@avaidyam avaidyam One button to rule them all!
Extended to support popups and pulldowns. (replaces NSPopupButtonCell
and NSButtonCell both at once!)
@avaidyam avaidyam Fire control actions and wrap values properly. 644300a
@avaidyam avaidyam Merge branch 'master' into upstream-slider d876024
Commits on Dec 23, 2012
@avaidyam avaidyam Verbosity. 066f754
@avaidyam avaidyam Remove button from XIB 5d8d3be
Commits on Dec 26, 2012
@luosheng luosheng Remove hover state when TUIControl is highlighted. 27c6805
@jwilling jwilling Merge pull request #153 from luosheng/fix-highlight-state
Fix TUIButton highlighted state.
Commits on Dec 28, 2012
@avaidyam avaidyam Extend button examples. 54dc8f6
@avaidyam avaidyam Style fixes. feebda3
@avaidyam avaidyam Added slider control sizes. (And fixed a race condition). 92ee7f2
@avaidyam avaidyam Add proper control sizing. (And some fixes.) bacdadb
@avaidyam avaidyam Fix stuff. fa6960b
@avaidyam avaidyam Refactoring and button fixes. 06b89ca
@avaidyam avaidyam Finalize button menu system. 5754c50
@avaidyam avaidyam Reverted button tests. df5d84c
Commits on Dec 29, 2012
@avaidyam avaidyam Fix button example. ec52377
@avaidyam avaidyam Merge branch 'upstream-multitouch'
@avaidyam avaidyam Merge remote-tracking branch 'upstream/master' 7282de7
Commits on Dec 30, 2012
@avaidyam avaidyam Merge branch 'master' into upstream-button-additions
Commits on Dec 31, 2012
@avaidyam avaidyam Fix button sizing. be3a7b6
@avaidyam avaidyam Removed file no longer linked and fixed header imports. 58e8a04
Commits on Feb 21, 2013
@acrist acrist Outline view will open from down 1c20271
@acrist acrist Open closed
Close opened
Toggle if opened bellow
Commits on Feb 22, 2013
@acrist acrist Move outline view into UIKit 2132bc4
@acrist acrist Fixed paths 18f1a7e
Commits on Feb 25, 2013
@acrist acrist Added background view, to draw cells bellow 3231edb
@acrist acrist Added backgroundView for displaying de104c9
Commits on Feb 26, 2013
@acrist acrist TUINavigationController support swipe events
TUIView could delegate scroll events
TUIScrollView will forward horizontal scrolls to super
TUINavigationController could swipe with motionBlur
@acrist acrist Changed type definitions to NS_ENUM
Fixed NSUIntegrer for ordering
Commits on Feb 28, 2013
@acrist acrist 10.8 native transformation from NS to CG and form CG to NS
Added relation for backingScale to draw pattern proper on retina screens
@acrist acrist Fixed positions for Pushing View e82b3f8
@acrist acrist NavigationController animations tunning d837c5c
@acrist acrist Workaround with nested aminations f0f7301
@marchenkoigor marchenkoigor Adding podspec 9f37da5
@acrist acrist Added content reload protection methods into TableView 931b326
@marchenkoigor marchenkoigor no message c9f8c5f
@marchenkoigor marchenkoigor Updates to podspec 7d05d71
@marchenkoigor marchenkoigor Updates e47515e
@acrist acrist fixed navigation controller slider bac2253
Commits on Mar 05, 2013
@acrist acrist Now table view will proper animate in case that header is hil ae5e399
Commits on Mar 14, 2013
@acrist acrist Merged twui pull request #106 from twitter/twui
Multiple selection
Commits on Mar 19, 2013
Serhey Tkachenko Added key down event support in TUITableViewDelegate 8e08755
Commits on Mar 21, 2013
Serhey Tkachenko Changes in tableView cells layout to provide proper index path to cel…
…l when it's added to table view as subview
Commits on Mar 24, 2013
Serhey Tkachenko Added new carousel navigation controller ab64e3c
Serhey Tkachenko Fixed bug in carousel navigation controller in swipe support 49412e4
Commits on Mar 25, 2013
Serhey Tkachenko CarouselNavigationController improvements 9e74860
Commits on Mar 26, 2013
Serhey Tkachenko Fixed bug in TUIScroller (turn off layout if scroller has zero size) 1eff629
Commits on Mar 29, 2013
Serhey Tkachenko Fixed bug with row selection using up/down keys in TUITableView; fixe…
…d typos
Commits on Apr 01, 2013
Serhey Tkachenko Removed using of _iterationCount variable in TUITableView and double …
…cell selection in TUITableViewCell. Because I don't understatnd why this code was added. I'll return it if we have problems.
Commits on Apr 02, 2013
@mralexgray merging upstrream cef8e1b