diff options
| author | Siqi LIU <me@siqi.fr> | 2013-08-18 00:08:38 +0800 |
|---|---|---|
| committer | Siqi LIU <me@siqi.fr> | 2013-08-18 15:22:14 +0800 |
| commit | 3c5369840cf305ca92f4c04cc914b14b76c81562 (patch) | |
| tree | 6b59358651e5b809ca18776cbe2153109324a0ae /ios | |
| parent | 2ab48412d971dbe0ee8e6f7303a273612b47db8c (diff) | |
popover view when no WiFi interface is found for ex
Change-Id: Ib37fa00b58a1c4193b4181699e385dcb6502edac
Diffstat (limited to 'ios')
| -rwxr-xr-x | ios/iosremote/PopoverView.m | 4 | ||||
| -rwxr-xr-x | ios/iosremote/PopoverView_Configuration.h | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ios/iosremote/PopoverView.m b/ios/iosremote/PopoverView.m index 2fac1839d7fc..ceeb73f0569e 100755 --- a/ios/iosremote/PopoverView.m +++ b/ios/iosremote/PopoverView.m @@ -158,7 +158,7 @@ - (void)showAtPoint:(CGPoint)point inView:(UIView *)view withText:(NSString *)text { - UIFont *font = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? kTextFontPad : kTextFontPhone; + UIFont *font = UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad ? kSmallTextFontPad : kTextFontPhone; CGSize screenSize = [self screenSize]; CGSize textSize = [text sizeWithFont:font constrainedToSize:CGSizeMake(screenSize.width - kHorizontalMargin*4.f, 1000.f) lineBreakMode:UILineBreakModeWordWrap]; @@ -168,7 +168,7 @@ textView.userInteractionEnabled = NO; [textView setNumberOfLines:0]; //This is so the label word wraps instead of cutting off the text textView.font = font; - textView.textAlignment = kTextAlignment; + textView.textAlignment = kTextAlignmentLeft; textView.textColor = kTextColor; textView.text = text; diff --git a/ios/iosremote/PopoverView_Configuration.h b/ios/iosremote/PopoverView_Configuration.h index 586d9da7806f..cfe141e96a5b 100755 --- a/ios/iosremote/PopoverView_Configuration.h +++ b/ios/iosremote/PopoverView_Configuration.h @@ -53,7 +53,7 @@ // DIVIDERS BETWEEN VIEWS //Bool that turns off/on the dividers -#define kShowDividersBetweenViews NO +#define kShowDividersBetweenViews YES //color for the divider fill #define kDividerColor [UIColor colorWithRed:0.329 green:0.341 blue:0.353 alpha:0.15f] @@ -88,6 +88,8 @@ //normal text font #define kTextFontPad [UIFont fontWithName:@"HelveticaNeue" size:20.f] +#define kSmallTextFontPad [UIFont fontWithName:@"HelveticaNeue" size:16.f] + //normal text color #define kTextColor [UIColor colorWithRed:0.329 green:0.341 blue:0.353 alpha:1] // highlighted text color @@ -96,6 +98,9 @@ //normal text alignment #define kTextAlignment UITextAlignmentCenter +//normal text alignment +#define kTextAlignmentLeft UITextAlignmentLeft + //title font #define kTitleFontPhone [UIFont fontWithName:@"HelveticaNeue-Bold" size:16.f] |