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

Side by Side Diff: ui/views/examples/progress_bar_example.cc

Issue 2329633003: Implement progress bar spec (determinate and indeterminate). (Closed)
Patch Set: attempt to unbreak mac and unit test Created 4 years, 3 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/views/controls/progress_bar_unittest.cc ('k') | no next file » | 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/views/examples/progress_bar_example.h" 5 #include "ui/views/examples/progress_bar_example.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "ui/views/controls/button/label_button.h" 10 #include "ui/views/controls/button/md_text_button.h"
11 #include "ui/views/controls/progress_bar.h" 11 #include "ui/views/controls/progress_bar.h"
12 #include "ui/views/layout/grid_layout.h" 12 #include "ui/views/layout/grid_layout.h"
13 #include "ui/views/view.h" 13 #include "ui/views/view.h"
14 14
15 namespace { 15 namespace {
16 16
17 const double kStepSize = 0.1; 17 const double kStepSize = 0.1;
18 18
19 double SetToMax(double percent) { 19 double SetToMax(double percent) {
20 return std::min(std::max(percent, 0.0), 1.0); 20 return std::min(std::max(percent, 0.0), 1.0);
21 } 21 }
22 22
23 } // namespace 23 } // namespace
24 24
25 namespace views { 25 namespace views {
26 namespace examples { 26 namespace examples {
27 27
28 ProgressBarExample::ProgressBarExample() 28 ProgressBarExample::ProgressBarExample()
29 : ExampleBase("Progress Bar"), 29 : ExampleBase("Progress Bar"),
30 minus_button_(NULL), 30 minus_button_(nullptr),
31 plus_button_(NULL), 31 plus_button_(nullptr),
32 progress_bar_(NULL), 32 progress_bar_(nullptr),
33 current_percent_(0.0) { 33 current_percent_(0.0) {}
34 }
35 34
36 ProgressBarExample::~ProgressBarExample() { 35 ProgressBarExample::~ProgressBarExample() {
37 } 36 }
38 37
39 void ProgressBarExample::CreateExampleView(View* container) { 38 void ProgressBarExample::CreateExampleView(View* container) {
40 GridLayout* layout = new GridLayout(container); 39 GridLayout* layout = new GridLayout(container);
41 container->SetLayoutManager(layout); 40 container->SetLayoutManager(layout);
42 41
43 ColumnSet* column_set = layout->AddColumnSet(0); 42 ColumnSet* column_set = layout->AddColumnSet(0);
44 column_set->AddColumn(GridLayout::LEADING, GridLayout::FILL, 43 column_set->AddColumn(GridLayout::TRAILING, GridLayout::CENTER, 0,
45 0, GridLayout::USE_PREF, 0, 0); 44 GridLayout::USE_PREF, 0, 0);
46 column_set->AddPaddingColumn(0, 8); 45 column_set->AddPaddingColumn(0, 8);
47 column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 46 column_set->AddColumn(GridLayout::FILL, GridLayout::CENTER, 1,
48 1, GridLayout::USE_PREF, 0, 0); 47 GridLayout::FIXED, 200, 0);
49 column_set->AddPaddingColumn(0, 8); 48 column_set->AddPaddingColumn(0, 8);
50 column_set->AddColumn(GridLayout::TRAILING, GridLayout::FILL, 49 column_set->AddColumn(GridLayout::LEADING, GridLayout::CENTER, 0,
51 0, GridLayout::USE_PREF, 0, 0); 50 GridLayout::USE_PREF, 0, 0);
52 51
53 layout->StartRow(0, 0); 52 layout->StartRow(0, 0);
54 minus_button_ = new LabelButton(this, base::ASCIIToUTF16("-")); 53 minus_button_ = MdTextButton::Create(this, base::ASCIIToUTF16("-"));
55 layout->AddView(minus_button_); 54 layout->AddView(minus_button_);
56 progress_bar_ = new ProgressBar(); 55 progress_bar_ = new ProgressBar();
57 layout->AddView(progress_bar_); 56 layout->AddView(progress_bar_);
58 plus_button_ = new LabelButton(this, base::ASCIIToUTF16("+")); 57 plus_button_ = MdTextButton::Create(this, base::ASCIIToUTF16("+"));
59 layout->AddView(plus_button_); 58 layout->AddView(plus_button_);
59
60 layout->StartRowWithPadding(0, 0, 0, 10);
61 layout->AddView(new Label(base::ASCIIToUTF16("Infinite loader:")));
62 ProgressBar* infinite_bar = new ProgressBar();
63 infinite_bar->SetValue(-1);
64 layout->AddView(infinite_bar);
65
66 layout->StartRowWithPadding(0, 0, 0, 10);
67 layout->AddView(
68 new Label(base::ASCIIToUTF16("Infinite loader (very short):")));
69 ProgressBar* shorter_bar = new ProgressBar(2);
70 shorter_bar->SetValue(-1);
71 layout->AddView(shorter_bar);
60 } 72 }
61 73
62 void ProgressBarExample::ButtonPressed(Button* sender, const ui::Event& event) { 74 void ProgressBarExample::ButtonPressed(Button* sender, const ui::Event& event) {
63 if (sender == minus_button_) 75 if (sender == minus_button_)
64 current_percent_ = SetToMax(current_percent_ - kStepSize); 76 current_percent_ = SetToMax(current_percent_ - kStepSize);
65 else if (sender == plus_button_) 77 else if (sender == plus_button_)
66 current_percent_ = SetToMax(current_percent_ + kStepSize); 78 current_percent_ = SetToMax(current_percent_ + kStepSize);
67 79
68 progress_bar_->SetValue(current_percent_); 80 progress_bar_->SetValue(current_percent_);
69 } 81 }
70 82
71 } // namespace examples 83 } // namespace examples
72 } // namespace views 84 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/progress_bar_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698