Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(296)

Side by Side Diff: chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.mm

Issue 2627483003: Centering turn on Bluetooth message on the chooser (Closed)
Patch Set: centering turn on Bluetooth message on the chooser Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.h" 5 #import "chrome/browser/ui/cocoa/device_chooser_content_view_cocoa.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/sys_string_conversions.h" 10 #include "base/strings/sys_string_conversions.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 // Separator alpha value. 53 // Separator alpha value.
54 const CGFloat kSeparatorAlphaValue = 0.6f; 54 const CGFloat kSeparatorAlphaValue = 0.6f;
55 55
56 // Separator height. 56 // Separator height.
57 const CGFloat kSeparatorHeight = 1.0f; 57 const CGFloat kSeparatorHeight = 1.0f;
58 58
59 // Distance between two views inside the table row view. 59 // Distance between two views inside the table row view.
60 const CGFloat kTableRowViewHorizontalPadding = 5.0f; 60 const CGFloat kTableRowViewHorizontalPadding = 5.0f;
61 const CGFloat kTableRowViewVerticalPadding = 1.0f; 61 const CGFloat kTableRowViewVerticalPadding = 1.0f;
62 62
63 // Distance between the adapter off help link and the scroll view boundaries.
64 const CGFloat kAdapterOffHelpLinkPadding = 5.0f;
65
66 // The lookup table for signal strength level image. 63 // The lookup table for signal strength level image.
67 const int kSignalStrengthLevelImageIds[5] = {IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR, 64 const int kSignalStrengthLevelImageIds[5] = {IDR_SIGNAL_0_BAR, IDR_SIGNAL_1_BAR,
68 IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR, 65 IDR_SIGNAL_2_BAR, IDR_SIGNAL_3_BAR,
69 IDR_SIGNAL_4_BAR}; 66 IDR_SIGNAL_4_BAR};
70 const int kSignalStrengthLevelImageSelectedIds[5] = { 67 const int kSignalStrengthLevelImageSelectedIds[5] = {
71 IDR_SIGNAL_0_BAR_SELECTED, IDR_SIGNAL_1_BAR_SELECTED, 68 IDR_SIGNAL_0_BAR_SELECTED, IDR_SIGNAL_1_BAR_SELECTED,
72 IDR_SIGNAL_2_BAR_SELECTED, IDR_SIGNAL_3_BAR_SELECTED, 69 IDR_SIGNAL_2_BAR_SELECTED, IDR_SIGNAL_3_BAR_SELECTED,
73 IDR_SIGNAL_4_BAR_SELECTED}; 70 IDR_SIGNAL_4_BAR_SELECTED};
74 71
75 // Creates a label with |text|. 72 // Creates a label with |text|.
(...skipping 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 createHyperlinkButtonWithText: 424 createHyperlinkButtonWithText:
428 l10n_util::GetNSString( 425 l10n_util::GetNSString(
429 IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ON_BLUETOOTH_LINK_TEXT)]; 426 IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ON_BLUETOOTH_LINK_TEXT)];
430 CGFloat adapterOffHelpButtonWidth = NSWidth([adapterOffHelpButton_ frame]); 427 CGFloat adapterOffHelpButtonWidth = NSWidth([adapterOffHelpButton_ frame]);
431 CGFloat adapterOffHelpButtonHeight = 428 CGFloat adapterOffHelpButtonHeight =
432 NSHeight([adapterOffHelpButton_ frame]); 429 NSHeight([adapterOffHelpButton_ frame]);
433 430
434 // Adapter turned off message. 431 // Adapter turned off message.
435 adapterOffMessage_ = CreateLabel(l10n_util::GetNSStringF( 432 adapterOffMessage_ = CreateLabel(l10n_util::GetNSStringF(
436 IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ADAPTER_OFF, base::string16())); 433 IDS_BLUETOOTH_DEVICE_CHOOSER_TURN_ADAPTER_OFF, base::string16()));
434 CGFloat adapterOffMessageWidth = NSWidth([adapterOffMessage_ frame]);
437 435
438 // Connect button. 436 // Connect button.
439 connectButton_ = [self createConnectButton]; 437 connectButton_ = [self createConnectButton];
440 CGFloat connectButtonWidth = NSWidth([connectButton_ frame]); 438 CGFloat connectButtonWidth = NSWidth([connectButton_ frame]);
441 CGFloat connectButtonHeight = NSHeight([connectButton_ frame]); 439 CGFloat connectButtonHeight = NSHeight([connectButton_ frame]);
442 440
443 // Cancel button. 441 // Cancel button.
444 cancelButton_ = [self createCancelButton]; 442 cancelButton_ = [self createCancelButton];
445 CGFloat cancelButtonWidth = NSWidth([cancelButton_ frame]); 443 CGFloat cancelButtonWidth = NSWidth([cancelButton_ frame]);
446 444
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 kSpinnerSize)]); 519 kSpinnerSize)]);
522 520
523 // Lay out the views. 521 // Lay out the views.
524 // Title. 522 // Title.
525 CGFloat titleOriginX = kMarginX; 523 CGFloat titleOriginX = kMarginX;
526 CGFloat titleOriginY = kChooserHeight - kMarginY - titleHeight; 524 CGFloat titleOriginY = kChooserHeight - kMarginY - titleHeight;
527 [titleView_ setFrameOrigin:NSMakePoint(titleOriginX, titleOriginY)]; 525 [titleView_ setFrameOrigin:NSMakePoint(titleOriginX, titleOriginY)];
528 [self addSubview:titleView_]; 526 [self addSubview:titleView_];
529 527
530 // Adapter turned off help button. 528 // Adapter turned off help button.
531 CGFloat adapterOffHelpButtonOriginX = kMarginX + kAdapterOffHelpLinkPadding; 529 CGFloat adapterOffHelpButtonOriginX =
Robert Sesek 2017/01/10 21:25:19 Consider flooring this in case the division result
juncai 2017/01/11 00:12:50 Done.
532 CGFloat adapterOffHelpButtonOriginY = titleOriginY - kVerticalPadding - 530 scrollViewOriginX +
533 adapterOffHelpButtonHeight - 531 (scrollViewWidth - adapterOffHelpButtonWidth - adapterOffMessageWidth) /
534 kAdapterOffHelpLinkPadding; 532 2;
533 CGFloat adapterOffHelpButtonOriginY =
534 scrollViewOriginY + (scrollViewHeight - adapterOffHelpButtonHeight) / 2;
535 [adapterOffHelpButton_ 535 [adapterOffHelpButton_
536 setFrameOrigin:NSMakePoint(adapterOffHelpButtonOriginX, 536 setFrameOrigin:NSMakePoint(adapterOffHelpButtonOriginX,
537 adapterOffHelpButtonOriginY)]; 537 adapterOffHelpButtonOriginY)];
538 [adapterOffHelpButton_ setTarget:self]; 538 [adapterOffHelpButton_ setTarget:self];
539 [adapterOffHelpButton_ setAction:@selector(onAdapterOffHelp:)]; 539 [adapterOffHelpButton_ setAction:@selector(onAdapterOffHelp:)];
540 [adapterOffHelpButton_ setHidden:YES]; 540 [adapterOffHelpButton_ setHidden:YES];
541 [self addSubview:adapterOffHelpButton_]; 541 [self addSubview:adapterOffHelpButton_];
542 542
543 // Adapter turned off message. 543 // Adapter turned off message.
544 CGFloat adapterOffMessageOriginX = adapterOffHelpButtonOriginX + 544 CGFloat adapterOffMessageOriginX = adapterOffHelpButtonOriginX +
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
900 900
901 - (void)drawRect:(NSRect)rect { 901 - (void)drawRect:(NSRect)rect {
902 [[NSColor colorWithCalibratedWhite:245.0f / 255.0f alpha:1.0f] setFill]; 902 [[NSColor colorWithCalibratedWhite:245.0f / 255.0f alpha:1.0f] setFill];
903 NSRect footnoteFrame = 903 NSRect footnoteFrame =
904 NSMakeRect(0.0f, 0.0f, kChooserWidth, separatorOriginY_); 904 NSMakeRect(0.0f, 0.0f, kChooserWidth, separatorOriginY_);
905 NSRectFill(footnoteFrame); 905 NSRectFill(footnoteFrame);
906 [super drawRect:footnoteFrame]; 906 [super drawRect:footnoteFrame];
907 } 907 }
908 908
909 @end 909 @end
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698