Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge pull request #4 from atebits/dev

Dev
  • Loading branch information...
commit f354c6d96cbfc2139de90c16a10fb3e878906149 2 parents eb17527 + e19b491
@joshaber joshaber authored
View
4 ExampleProject/ConcordeExample/ExampleView.m
@@ -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
View
2  ExampleProject/ConcordeExample/main.m
@@ -31,8 +31,6 @@ int main(int argc, char *argv[])
if((major == 10 && minor >= 7) || major >= 11) {
AtLeastLion = YES;
}
-
- Screen_Scale = [[NSScreen mainScreen] userSpaceScaleFactor]; // hidpi is still a work in progress
return NSApplicationMain(argc, (const char **)argv);
}
View
2  lib/UIKit/TUINSView.m
@@ -203,7 +203,7 @@ - (void)_updateLayerScaleFactor {
- (void)screenProfileOrBackingPropertiesDidChange:(NSNotification *)notification
{
- [self _updateLayerScaleFactor];
+ [self performSelector:@selector(_updateLayerScaleFactor) withObject:nil afterDelay:0.0]; // the window's backingScaleFactor doesn't update until after this notification fires (10.8) - so delay it a bit.
}
- (TUIView *)viewForLocalPoint:(NSPoint)p
View
2  lib/UIKit/TUIProgressBar.h
@@ -14,7 +14,7 @@
limitations under the License.
*/
-#import <TwUI/TUIKit.h>
+#import "TUIView.h"
enum _TUIProgressBarStyle
{
View
2  lib/UIKit/TUIProgressBar.m
@@ -14,7 +14,9 @@
limitations under the License.
*/
+#import "TUIKit.h"
#import "TUIProgressBar.h"
+#import "CAAnimation+TUIExtensions.h"
NSString *GHUIProgressBarSetNeedsDisplayObservationContext = @"GHUIProgressBarSetNeedsDisplayObservationContext";
View
6 lib/UIKit/TUIView+Private.m
@@ -62,10 +62,8 @@ - (void)_updateLayerScaleFactor
}
if([self.layer respondsToSelector:@selector(setContentsScale:)]) {
- if(fabs(self.layer.contentsScale - scale) > 0.1f) {
- self.layer.contentsScale = scale;
- [self.layer setNeedsDisplay];
- }
+ self.layer.contentsScale = scale;
+ [self setNeedsDisplay];
}
}
}

0 comments on commit f354c6d

Please sign in to comment.
Something went wrong with that request. Please try again.