| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 #ifndef UI_VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ | 5 #ifndef UI_VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ |
| 6 #define UI_VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ | 6 #define UI_VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ |
| 7 | 7 |
| 8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
| 9 #include "ui/views/layout/grid_layout.h" | 9 #include "ui/views/layout/grid_layout.h" |
| 10 | 10 |
| 11 // This file contains some constants we use to implement our standard panel | 11 // This file contains some constants we use to implement our standard panel |
| 12 // layout. | 12 // layout. |
| 13 // see: spec 21/4 | 13 // see: spec 21/4 |
| 14 | 14 |
| 15 namespace views { | 15 namespace views { |
| 16 | 16 |
| 17 // Left or right margin. | 17 // Left or right margin. |
| 18 const int kPanelHorizMargin = 13; | 18 constexpr int kPanelHorizMargin = 13; |
| 19 | 19 |
| 20 // Top or bottom margin. | 20 // Top or bottom margin. |
| 21 const int kPanelVertMargin = 13; | 21 constexpr int kPanelVertMargin = 13; |
| 22 | 22 |
| 23 // When several controls are aligned vertically, the baseline should be spaced | 23 // When several controls are aligned vertically, the baseline should be spaced |
| 24 // by the following number of pixels. | 24 // by the following number of pixels. |
| 25 const int kPanelVerticalSpacing = 32; | 25 constexpr int kPanelVerticalSpacing = 32; |
| 26 | 26 |
| 27 // Vertical spacing between sub UI. | 27 // Vertical spacing between sub UI. |
| 28 const int kPanelSubVerticalSpacing = 24; | 28 constexpr int kPanelSubVerticalSpacing = 24; |
| 29 | 29 |
| 30 // Vertical spacing between a label and some control. | 30 // Vertical spacing between a label and some control. |
| 31 const int kLabelToControlVerticalSpacing = 8; | 31 constexpr int kLabelToControlVerticalSpacing = 8; |
| 32 | 32 |
| 33 // Small horizontal spacing between controls that are logically related. | 33 // Small horizontal spacing between controls that are logically related. |
| 34 const int kRelatedControlSmallHorizontalSpacing = 8; | 34 constexpr int kRelatedControlSmallHorizontalSpacing = 8; |
| 35 | 35 |
| 36 // Horizontal spacing between controls that are logically related. | 36 // Horizontal spacing between controls that are logically related. |
| 37 const int kRelatedControlHorizontalSpacing = 8; | 37 constexpr int kRelatedControlHorizontalSpacing = 8; |
| 38 | 38 |
| 39 // Vertical spacing between controls that are logically related. | 39 // Vertical spacing between controls that are logically related. |
| 40 const int kRelatedControlVerticalSpacing = 8; | 40 constexpr int kRelatedControlVerticalSpacing = 8; |
| 41 | 41 |
| 42 // Small vertical spacing between controls that are logically related. | 42 // Small vertical spacing between controls that are logically related. |
| 43 const int kRelatedControlSmallVerticalSpacing = 4; | 43 constexpr int kRelatedControlSmallVerticalSpacing = 4; |
| 44 | 44 |
| 45 // Horizontal spacing between controls that are logically unrelated. | 45 // Horizontal spacing between controls that are logically unrelated. |
| 46 const int kUnrelatedControlHorizontalSpacing = 12; | 46 constexpr int kUnrelatedControlHorizontalSpacing = 12; |
| 47 | 47 |
| 48 // Larger horizontal spacing between unrelated controls. | 48 // Larger horizontal spacing between unrelated controls. |
| 49 const int kUnrelatedControlLargeHorizontalSpacing = 20; | 49 constexpr int kUnrelatedControlLargeHorizontalSpacing = 20; |
| 50 | 50 |
| 51 // Vertical spacing between controls that are logically unrelated. | 51 // Vertical spacing between controls that are logically unrelated. |
| 52 const int kUnrelatedControlVerticalSpacing = 20; | 52 constexpr int kUnrelatedControlVerticalSpacing = 20; |
| 53 | 53 |
| 54 // Larger vertical spacing between unrelated controls. | 54 // Larger vertical spacing between unrelated controls. |
| 55 const int kUnrelatedControlLargeVerticalSpacing = 30; | 55 constexpr int kUnrelatedControlLargeVerticalSpacing = 30; |
| 56 | 56 |
| 57 // Vertical spacing between the edge of the window and the | 57 // Vertical spacing between the edge of the window and the |
| 58 // top or bottom of a button. | 58 // top or bottom of a button. |
| 59 const int kButtonVEdgeMargin = 9; | 59 constexpr int kButtonVEdgeMargin = 9; |
| 60 | 60 |
| 61 // Horizontal spacing between the edge of the window and the | 61 // Horizontal spacing between the edge of the window and the |
| 62 // left or right of a button. | 62 // left or right of a button. |
| 63 const int kButtonHEdgeMargin = 13; | 63 constexpr int kButtonHEdgeMargin = 13; |
| 64 | 64 |
| 65 // Vertical spacing between the edge of the window and the | 65 // Vertical spacing between the edge of the window and the |
| 66 // top or bottom of a button (when using new style dialogs). | 66 // top or bottom of a button (when using new style dialogs). |
| 67 const int kButtonVEdgeMarginNew = 20; | 67 constexpr int kButtonVEdgeMarginNew = 20; |
| 68 | 68 |
| 69 // Horizontal spacing between the edge of the window and the | 69 // Horizontal spacing between the edge of the window and the |
| 70 // left or right of a button (when using new style dialogs). | 70 // left or right of a button (when using new style dialogs). |
| 71 const int kButtonHEdgeMarginNew = 20; | 71 constexpr int kButtonHEdgeMarginNew = 20; |
| 72 | 72 |
| 73 // Horizontal spacing between buttons that are logically related. | 73 // Horizontal spacing between buttons that are logically related. |
| 74 const int kRelatedButtonHSpacing = 6; | 74 constexpr int kRelatedButtonHSpacing = 6; |
| 75 | 75 |
| 76 // Indent of checkboxes relative to related text. | 76 // Indent of checkboxes relative to related text. |
| 77 const int kCheckboxIndent = 10; | 77 constexpr int kCheckboxIndent = 10; |
| 78 | 78 |
| 79 // Horizontal spacing between the end of an item (i.e. an icon or a checkbox) | 79 // Horizontal spacing between the end of an item (i.e. an icon or a checkbox) |
| 80 // and the start of its corresponding text. | 80 // and the start of its corresponding text. |
| 81 const int kItemLabelSpacing = 10; | 81 constexpr int kItemLabelSpacing = 10; |
| 82 | 82 |
| 83 } // namespace views | 83 } // namespace views |
| 84 | 84 |
| 85 #endif // UI_VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ | 85 #endif // UI_VIEWS_LAYOUT_LAYOUT_CONSTANTS_H_ |
| OLD | NEW |