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

Side by Side Diff: ui/app_list/views/page_switcher.cc

Issue 898253002: Update apps grid view layout to match latest mocks. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@search_box_animate_shadow
Patch Set: rebase Created 5 years, 10 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 | « ui/app_list/views/folder_header_view.cc ('k') | ui/app_list/views/search_result_page_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 (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 #include "ui/app_list/views/page_switcher.h" 5 #include "ui/app_list/views/page_switcher.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "third_party/skia/include/core/SkPath.h" 9 #include "third_party/skia/include/core/SkPath.h"
10 #include "ui/app_list/app_list_constants.h" 10 #include "ui/app_list/app_list_constants.h"
11 #include "ui/app_list/pagination_model.h" 11 #include "ui/app_list/pagination_model.h"
12 #include "ui/base/ui_base_switches_util.h" 12 #include "ui/base/ui_base_switches_util.h"
13 #include "ui/gfx/animation/throb_animation.h" 13 #include "ui/gfx/animation/throb_animation.h"
14 #include "ui/gfx/canvas.h" 14 #include "ui/gfx/canvas.h"
15 #include "ui/gfx/skia_util.h" 15 #include "ui/gfx/skia_util.h"
16 #include "ui/views/controls/button/custom_button.h" 16 #include "ui/views/controls/button/custom_button.h"
17 #include "ui/views/layout/box_layout.h" 17 #include "ui/views/layout/box_layout.h"
18 18
19 namespace app_list { 19 namespace app_list {
20 20
21 namespace { 21 namespace {
22 22
23 const int kPreferredHeight = 57; 23 const int kPreferredHeight = 58;
24 24
25 const int kMaxButtonSpacing = 18; 25 const int kMaxButtonSpacing = 18;
26 const int kMinButtonSpacing = 4; 26 const int kMinButtonSpacing = 4;
27 const int kMaxButtonWidth = 68; 27 const int kMaxButtonWidth = 68;
28 const int kMinButtonWidth = 28; 28 const int kMinButtonWidth = 28;
29 const int kButtonHeight = 6; 29 const int kButtonHeight = 6;
30 const int kButtonCornerRadius = 2; 30 const int kButtonCornerRadius = 2;
31 const int kButtonStripPadding = 20; 31 const int kButtonStripPadding = 20;
32 32
33 class PageSwitcherButton : public views::CustomButton { 33 class PageSwitcherButton : public views::CustomButton {
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
273 remaining = -remaining; 273 remaining = -remaining;
274 progress = -progress; 274 progress = -progress;
275 } 275 }
276 276
277 GetButtonByIndex(buttons_, current_page)->SetSelectedRange(remaining); 277 GetButtonByIndex(buttons_, current_page)->SetSelectedRange(remaining);
278 if (model_->is_valid_page(target_page)) 278 if (model_->is_valid_page(target_page))
279 GetButtonByIndex(buttons_, target_page)->SetSelectedRange(progress); 279 GetButtonByIndex(buttons_, target_page)->SetSelectedRange(progress);
280 } 280 }
281 281
282 } // namespace app_list 282 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/folder_header_view.cc ('k') | ui/app_list/views/search_result_page_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698