mirror of
https://github.com/yuzu-emu/breakpad.git
synced 2025-07-08 18:50:42 +00:00
Make localization resizing of Mac uploader email line more robust. Review URL: http://breakpad.appspot.com/247001
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@749 4c0a9323-5329-0410-9bdc-e9ce6186880e
This commit is contained in:
parent
717bf0ded2
commit
816f25011c
|
@ -616,17 +616,30 @@ NSString *const kDefaultServerType = @"google";
|
||||||
CGFloat emailLabelWidthDelta = [emailLabel_ breakpad_adjustWidthToFit];
|
CGFloat emailLabelWidthDelta = [emailLabel_ breakpad_adjustWidthToFit];
|
||||||
[emailEntryField_ breakpad_shiftHorizontally:emailLabelWidthDelta];
|
[emailEntryField_ breakpad_shiftHorizontally:emailLabelWidthDelta];
|
||||||
|
|
||||||
|
// Localize the privacy policy label, and keep it right-aligned to the arrow.
|
||||||
|
[privacyLinkLabel_ setStringValue:NSLocalizedString(@"privacyLabel", @"")];
|
||||||
|
CGFloat privacyLabelWidthDelta =
|
||||||
|
[privacyLinkLabel_ breakpad_adjustWidthToFit];
|
||||||
|
[privacyLinkLabel_ breakpad_shiftHorizontally:(-privacyLabelWidthDelta)];
|
||||||
|
|
||||||
|
// Ensure that the email field and the privacy policy link don't overlap.
|
||||||
|
CGFloat kMinControlPadding = 8;
|
||||||
|
CGFloat maxEmailFieldWidth = NSMinX([privacyLinkLabel_ frame]) -
|
||||||
|
NSMinX([emailEntryField_ frame]) -
|
||||||
|
kMinControlPadding;
|
||||||
|
if (NSWidth([emailEntryField_ bounds]) > maxEmailFieldWidth &&
|
||||||
|
maxEmailFieldWidth > 0) {
|
||||||
|
NSSize emailSize = [emailEntryField_ frame].size;
|
||||||
|
emailSize.width = maxEmailFieldWidth;
|
||||||
|
[emailEntryField_ setFrameSize:emailSize];
|
||||||
|
}
|
||||||
|
|
||||||
// Localize the placeholder text.
|
// Localize the placeholder text.
|
||||||
[[commentsEntryField_ cell]
|
[[commentsEntryField_ cell]
|
||||||
setPlaceholderString:NSLocalizedString(@"commentsPlaceholder", @"")];
|
setPlaceholderString:NSLocalizedString(@"commentsPlaceholder", @"")];
|
||||||
[[emailEntryField_ cell]
|
[[emailEntryField_ cell]
|
||||||
setPlaceholderString:NSLocalizedString(@"emailPlaceholder", @"")];
|
setPlaceholderString:NSLocalizedString(@"emailPlaceholder", @"")];
|
||||||
|
|
||||||
// Localize the privacy policy label, and keep it right-aligned to the arrow.
|
|
||||||
[privacyLinkLabel_ setStringValue:NSLocalizedString(@"privacyLabel", @"")];
|
|
||||||
CGFloat privacyLabelWidthDelta = [privacyLinkLabel_ breakpad_adjustWidthToFit];
|
|
||||||
[privacyLinkLabel_ breakpad_shiftHorizontally:(-privacyLabelWidthDelta)];
|
|
||||||
|
|
||||||
// Localize the buttons, and keep the cancel button at the right distance.
|
// Localize the buttons, and keep the cancel button at the right distance.
|
||||||
[sendButton_ setTitle:NSLocalizedString(@"sendReportButton", @"")];
|
[sendButton_ setTitle:NSLocalizedString(@"sendReportButton", @"")];
|
||||||
CGFloat sendButtonWidthDelta = [sendButton_ breakpad_smartSizeToFit];
|
CGFloat sendButtonWidthDelta = [sendButton_ breakpad_smartSizeToFit];
|
||||||
|
|
Loading…
Reference in a new issue