Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble-iphoneos.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2017-09-03 02:20:53 +0300
committerGitHub <noreply@github.com>2017-09-03 02:20:53 +0300
commitda8484d0d277dadb494acd5a8b416c7bb25f5197 (patch)
treeddd6fa2a940a0b7c131dbf05e2c490226d86c7fd
parente00622f8d827fadde84bb7509d8d65318be2dd9d (diff)
parenta9f7c1206d7da45454f8cee770190cd77ccdc49e (diff)
Merge PR #115: MUMessageBubbleTableViewCell: do not hardcode screen width.
-rw-r--r--Source/Classes/MUMessageBubbleTableViewCell.m6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Classes/MUMessageBubbleTableViewCell.m b/Source/Classes/MUMessageBubbleTableViewCell.m
index d6bfe31..c03d58f 100644
--- a/Source/Classes/MUMessageBubbleTableViewCell.m
+++ b/Source/Classes/MUMessageBubbleTableViewCell.m
@@ -15,7 +15,6 @@
#define kBalloonTopPadding 3.0f
#define kBalloonBottomPadding 3.0f
#define kBalloonTimestampSpacing 5.0f
-#define kPhoneWidth 320.0f
#define kBalloonTopInset 14.0f
#define kBalloonBottomInset 17.0f
#define kBalloonTailInset 23.0f
@@ -205,9 +204,10 @@
CGRect timestampRect = CGRectMake(imgRect.size.width - kBalloonMarginNonTailSide - timestampSize.width, headerRect.origin.y, timestampSize.width, timestampSize.height);
CGRect textRect = CGRectMake(kBalloonMarginTailSide, kBalloonTopPadding + kBalloonTopMargin + headingSize.height, textSize.width, textSize.height);
if (_rightSide) {
- imgRect.origin.x = kPhoneWidth - imgRect.size.width;
+ CGRect frame = [self frame];
+ imgRect.origin.x = CGRectGetWidth(frame) - imgRect.size.width;
headerRect.origin.x = imgRect.origin.x + kBalloonMarginNonTailSide;
- timestampRect.origin.x = kPhoneWidth - kBalloonMarginTailSide - timestampRect.size.width;
+ timestampRect.origin.x = CGRectGetWidth(frame) - kBalloonMarginTailSide - timestampRect.size.width;
textRect.origin.x = imgRect.origin.x + kBalloonMarginNonTailSide;
}