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

Side by Side Diff: ash/common/shelf/shelf_constants.cc

Issue 2099103002: Give Ash material design tray items the correct size and layout (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: split shelf and tray constants Created 4 years, 5 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
« no previous file with comments | « ash/common/shelf/shelf_constants.h ('k') | ash/common/system/tray/tray_background_view.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "ash/common/shelf/shelf_constants.h" 5 #include "ash/common/shelf/shelf_constants.h"
6 6
7 #include "ash/common/material_design/material_design_controller.h" 7 #include "ash/common/material_design/material_design_controller.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "third_party/skia/include/core/SkColor.h" 9 #include "third_party/skia/include/core/SkColor.h"
10 10
11 namespace ash { 11 namespace ash {
12 12
13 const int kInvalidImageResourceID = -1; 13 const int kInvalidImageResourceID = -1;
14 const int kTimeToSwitchBackgroundMs = 1000; 14 const int kTimeToSwitchBackgroundMs = 1000;
15 const int kWorkspaceAreaVisibleInset = 2; 15 const int kWorkspaceAreaVisibleInset = 2;
16 const int kWorkspaceAreaAutoHideInset = 5; 16 const int kWorkspaceAreaAutoHideInset = 5;
17 const int kShelfAutoHideSize = 3; 17 const int kShelfAutoHideSize = 3;
18 const int kShelfItemInset = 3; 18 const int kShelfItemInset = 3;
19 const SkColor kShelfBaseColor = SK_ColorBLACK; 19 const SkColor kShelfBaseColor = SK_ColorBLACK;
20 const SkColor kShelfButtonActivatedHighlightColor = 20 const SkColor kShelfButtonActivatedHighlightColor =
21 SkColorSetA(SK_ColorWHITE, 100); 21 SkColorSetA(SK_ColorWHITE, 100);
22 const float kShelfInkDropVisibleOpacity = 0.2f; 22 const float kShelfInkDropVisibleOpacity = 0.2f;
23 const SkColor kShelfIconColor = SK_ColorWHITE; 23 const SkColor kShelfIconColor = SK_ColorWHITE;
24 const int kOverflowButtonSize = 32;
25 const int kOverflowButtonCornerRadius = 2;
26 const int kAppListButtonRadius = kOverflowButtonSize / 2;
24 27
25 int GetShelfConstant(ShelfConstant shelf_constant) { 28 int GetShelfConstant(ShelfConstant shelf_constant) {
26 const int kShelfBackgroundAlpha[] = {204, 204, 153}; 29 const int kShelfBackgroundAlpha[] = {204, 204, 153};
27 const int kShelfSize[] = {47, 47, 48}; 30 const int kShelfSize[] = {47, 47, 48};
28 const int kShelfButtonSpacing[] = {10, 10, 16}; 31 const int kShelfButtonSpacing[] = {10, 10, 16};
29 const int kShelfButtonSize[] = {44, 44, 48}; 32 const int kShelfButtonSize[] = {44, 44, 48};
30 const int kShelfInsetsForAutoHide[] = {3, 3, 0}; 33 const int kShelfInsetsForAutoHide[] = {3, 3, 0};
31 34
32 const int mode = MaterialDesignController::GetMode(); 35 const int mode = MaterialDesignController::GetMode();
33 DCHECK(mode >= MaterialDesignController::NON_MATERIAL && 36 DCHECK(mode >= MaterialDesignController::NON_MATERIAL &&
34 mode <= MaterialDesignController::MATERIAL_EXPERIMENTAL); 37 mode <= MaterialDesignController::MATERIAL_EXPERIMENTAL);
35 38
36 switch (shelf_constant) { 39 switch (shelf_constant) {
37 case SHELF_BACKGROUND_ALPHA: 40 case SHELF_BACKGROUND_ALPHA:
38 return kShelfBackgroundAlpha[mode]; 41 return kShelfBackgroundAlpha[mode];
39 case SHELF_SIZE: 42 case SHELF_SIZE:
40 return kShelfSize[mode]; 43 return kShelfSize[mode];
41 case SHELF_BUTTON_SPACING: 44 case SHELF_BUTTON_SPACING:
42 return kShelfButtonSpacing[mode]; 45 return kShelfButtonSpacing[mode];
43 case SHELF_BUTTON_SIZE: 46 case SHELF_BUTTON_SIZE:
44 return kShelfButtonSize[mode]; 47 return kShelfButtonSize[mode];
45 case SHELF_INSETS_FOR_AUTO_HIDE: 48 case SHELF_INSETS_FOR_AUTO_HIDE:
46 return kShelfInsetsForAutoHide[mode]; 49 return kShelfInsetsForAutoHide[mode];
47 } 50 }
48 NOTREACHED(); 51 NOTREACHED();
49 return 0; 52 return 0;
50 } 53 }
51 54
52 } // namespace ash 55 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/shelf/shelf_constants.h ('k') | ash/common/system/tray/tray_background_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698