Chromium Code Reviews| Index: chrome/browser/ui/constrained_window.h |
| diff --git a/chrome/browser/ui/constrained_window.h b/chrome/browser/ui/constrained_window.h |
| index 21efd6512df764d60d64ccba88fbcdcaf2e02e3d..200f58c561a5df108436cb767f34a00fb057a57c 100644 |
| --- a/chrome/browser/ui/constrained_window.h |
| +++ b/chrome/browser/ui/constrained_window.h |
| @@ -18,10 +18,72 @@ |
| // |
| class ConstrainedWindow { |
| public: |
| - static const int kVerticalPadding = 14; // top/bottom padding. |
| - static const int kHorizontalPadding = 17; // left/right padding. |
| - static const int kRowPadding = 20; // Vertical margin between dialog rows. |
| - static const int kBorderRadius = 2; // Border radius for dialog corners. |
| + // The kTitleTopPadding is the padding between the top of the window and the |
|
Ben Goodger (Google)
2012/10/10 16:11:54
I would tend to put all of this in a file separate
please use gerrit instead
2012/10/10 19:12:58
Kenmoore@ has asked to use regular padding without
|
| + // title. The goal is to have 20px between the top of the window and the |
| + // x-height of the message. |
| + // |
| + // The kVerticalPadding is the default padding beetween the buttons on the |
| + // bottom of the window and the bottom border. |
| + // |
| + // The kHorizontalPadding is the default padding between the left size of the |
| + // window and the contents; and between the right side of the window and the |
| + // contents. |
| + // |
| + // The kRowPadding is the default padding between the window title and the |
| + // message below. The goal is to have 20px between the base of the title and |
| + // the x-height of the message. |
| + // |
| + // ______________________________________________________________________ |
| + // | ^ ^ |
| + // | | | |
| + // | |--kTitleTopPadding | |
| + // | kHorizontalPadding | | |
| + // | | _________v_ |--20px |
| + // |<--------->|____ ____| | |
| + // | | | _ | |
| + // | | | |_| _ _ | |
| + // | | | _ _| |_ | | ____ _v__ _ _ _ _ x-height |
| + // | | | | | |_ _| | | | _ | | | |
| + // | | | | | | |_ | | | __| | [] | |
| + // | |_| |_| |___| |_| |____| | __| _ _ _ _ baseline |
| + // | _ _ _ _ _ _ _^_ _ _ _ _ _ _ |_| |
| + // | ^ | |
| + // | kRowPadding--| | |
| + // | _ v |--20px |
| + // | || || | |
| + // | || || _ _ _ _v _ _ _ _ _ _ x-height |
| + // | | \/ ||_ |_ |_ _|| ||_ |
| + // | ||\/|||_ _| _||_||_||_ _ _ _ _ baseline |
| + // | _| |
| + // |
| + static const int kTitleTopPadding = 15; |
| + static const int kVerticalPadding = 20; |
| + static const int kHorizontalPadding = 20; |
| + static const int kRowPadding = 15; |
|
Peter Kasting
2012/10/09 19:31:10
How can these values be guaranteed to be correct a
please use gerrit instead
2012/10/10 19:12:58
The author of the mocks (kenmoore@) has asked us t
|
| + |
| + // Border radius for dialog corners. |
| + static const int kBorderRadius = 2; |
| + |
| + // This is the padding to use on the top and right sides of the "x" close |
| + // button in order for the button to appear 10px from the top border and 10px |
| + // from the right border. This padding is 4px because the image for the "x" |
| + // close button has an invisible 6px border. |
|
Peter Kasting
2012/10/09 19:31:10
Is this border so the button will have a larger hi
please use gerrit instead
2012/10/10 19:12:58
The border is so the button has a larger hit area.
|
| + // |
| + // _______________________________________________ |
| + // ^ | |
| + // 4px | |
| + // v | |
| + // ___________________ | |
| + // | ^ | | |
| + // | 6px | | |
| + // | v | | |
| + // | X < 6px > | < 4px > | |
| + // | | | |
| + // | | | |
| + // |___________________| | |
| + // | |
| + // |
| + static const int kCloseButtonPadding = 4; |
| // Font style for dialog text. |
| static const ui::ResourceBundle::FontStyle kTextFontStyle = |