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

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

Issue 2898743002: Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: adressed comments. Created 3 years, 6 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
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/search_box_view.h" 5 #include "ui/app_list/views/search_box_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/memory/ptr_util.h" 10 #include "base/memory/ptr_util.h"
11 #include "build/build_config.h" 11 #include "build/build_config.h"
12 #include "ui/app_list/app_list_constants.h" 12 #include "ui/app_list/app_list_constants.h"
13 #include "ui/app_list/app_list_features.h"
13 #include "ui/app_list/app_list_model.h" 14 #include "ui/app_list/app_list_model.h"
14 #include "ui/app_list/app_list_switches.h" 15 #include "ui/app_list/app_list_switches.h"
15 #include "ui/app_list/app_list_view_delegate.h" 16 #include "ui/app_list/app_list_view_delegate.h"
16 #include "ui/app_list/resources/grit/app_list_resources.h" 17 #include "ui/app_list/resources/grit/app_list_resources.h"
17 #include "ui/app_list/search_box_model.h" 18 #include "ui/app_list/search_box_model.h"
18 #include "ui/app_list/speech_ui_model.h" 19 #include "ui/app_list/speech_ui_model.h"
20 #include "ui/app_list/views/app_list_view.h"
19 #include "ui/app_list/views/contents_view.h" 21 #include "ui/app_list/views/contents_view.h"
20 #include "ui/app_list/views/search_box_view_delegate.h" 22 #include "ui/app_list/views/search_box_view_delegate.h"
21 #include "ui/base/ime/text_input_flags.h" 23 #include "ui/base/ime/text_input_flags.h"
22 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
23 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
24 #include "ui/events/event.h" 26 #include "ui/events/event.h"
25 #include "ui/gfx/canvas.h" 27 #include "ui/gfx/canvas.h"
26 #include "ui/gfx/shadow_value.h" 28 #include "ui/gfx/shadow_value.h"
27 #include "ui/strings/grit/ui_strings.h" 29 #include "ui/strings/grit/ui_strings.h"
28 #include "ui/views/background.h" 30 #include "ui/views/background.h"
29 #include "ui/views/border.h" 31 #include "ui/views/border.h"
30 #include "ui/views/controls/button/image_button.h" 32 #include "ui/views/controls/button/image_button.h"
31 #include "ui/views/controls/image_view.h" 33 #include "ui/views/controls/image_view.h"
32 #include "ui/views/controls/textfield/textfield.h" 34 #include "ui/views/controls/textfield/textfield.h"
33 #include "ui/views/layout/box_layout.h" 35 #include "ui/views/layout/box_layout.h"
34 #include "ui/views/layout/fill_layout.h" 36 #include "ui/views/layout/fill_layout.h"
35 #include "ui/views/shadow_border.h" 37 #include "ui/views/shadow_border.h"
38 #include "ui/views/widget/widget.h"
36 39
37 namespace app_list { 40 namespace app_list {
38 41
39 namespace { 42 namespace {
40 43
41 const int kPadding = 16; 44 const int kPadding = 16;
42 const int kInnerPadding = 24; 45 const int kInnerPadding = 24;
43 const int kPreferredWidth = 360; 46 const int kPreferredWidth = 360;
47 const int kPreferredWidthFullscreen = 544;
44 const int kPreferredHeight = 48; 48 const int kPreferredHeight = 48;
45 49
46 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0); 50 const SkColor kHintTextColor = SkColorSetRGB(0xA0, 0xA0, 0xA0);
47 51
48 const int kBackgroundBorderCornerRadius = 2; 52 const int kBackgroundBorderCornerRadius = 2;
53 const int kBackgroundBorderCornerRadiusFullscreen = 20;
49 54
50 // A background that paints a solid white rounded rect with a thin grey border. 55 // A background that paints a solid white rounded rect with a thin grey border.
51 class SearchBoxBackground : public views::Background { 56 class SearchBoxBackground : public views::Background {
52 public: 57 public:
53 SearchBoxBackground() {} 58 SearchBoxBackground() {}
54 ~SearchBoxBackground() override {} 59 ~SearchBoxBackground() override {}
55 60
56 private: 61 private:
57 // views::Background overrides: 62 // views::Background overrides:
58 void Paint(gfx::Canvas* canvas, views::View* view) const override { 63 void Paint(gfx::Canvas* canvas, views::View* view) const override {
59 gfx::Rect bounds = view->GetContentsBounds(); 64 gfx::Rect bounds = view->GetContentsBounds();
60 65
61 cc::PaintFlags flags; 66 cc::PaintFlags flags;
62 flags.setAntiAlias(true); 67 flags.setAntiAlias(true);
63 flags.setColor(kSearchBoxBackground); 68 flags.setColor(kSearchBoxBackground);
64 canvas->DrawRoundRect(bounds, kBackgroundBorderCornerRadius, flags); 69 canvas->DrawRoundRect(bounds,
70 features::IsFullscreenAppListEnabled()
71 ? kBackgroundBorderCornerRadiusFullscreen
72 : kBackgroundBorderCornerRadius,
xiyuan 2017/05/26 18:27:32 Can we use a const member var for border radius an
newcomer 2017/05/26 23:20:22 Done.
73 flags);
65 } 74 }
66 75
67 DISALLOW_COPY_AND_ASSIGN(SearchBoxBackground); 76 DISALLOW_COPY_AND_ASSIGN(SearchBoxBackground);
68 }; 77 };
69 78
70 } // namespace 79 } // namespace
71 80
72 // To paint grey background on mic and back buttons 81 // To paint grey background on mic and back buttons
73 class SearchBoxImageButton : public views::ImageButton { 82 class SearchBoxImageButton : public views::ImageButton {
74 public: 83 public:
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
115 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate, 124 SearchBoxView::SearchBoxView(SearchBoxViewDelegate* delegate,
116 AppListViewDelegate* view_delegate) 125 AppListViewDelegate* view_delegate)
117 : delegate_(delegate), 126 : delegate_(delegate),
118 view_delegate_(view_delegate), 127 view_delegate_(view_delegate),
119 model_(NULL), 128 model_(NULL),
120 content_container_(new views::View), 129 content_container_(new views::View),
121 back_button_(NULL), 130 back_button_(NULL),
122 speech_button_(NULL), 131 speech_button_(NULL),
123 search_box_(new views::Textfield), 132 search_box_(new views::Textfield),
124 contents_view_(NULL), 133 contents_view_(NULL),
134 app_list_view_(NULL),
125 focused_view_(FOCUS_SEARCH_BOX) { 135 focused_view_(FOCUS_SEARCH_BOX) {
126 SetLayoutManager(new views::FillLayout); 136 SetLayoutManager(new views::FillLayout);
127 AddChildView(content_container_); 137 AddChildView(content_container_);
128 138
129 SetShadow(GetShadowForZHeight(2)); 139 SetShadow(GetShadowForZHeight(2));
130 back_button_ = new SearchBoxImageButton(this); 140 back_button_ = new SearchBoxImageButton(this);
131 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 141 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
132 back_button_->SetImage(views::ImageButton::STATE_NORMAL, 142 back_button_->SetImage(views::ImageButton::STATE_NORMAL,
133 rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL)); 143 rb.GetImageSkiaNamed(IDR_APP_LIST_FOLDER_BACK_NORMAL));
134 back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER, 144 back_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
(...skipping 15 matching lines...) Expand all
150 search_box_->SetBackgroundColor(kSearchBoxBackground); 160 search_box_->SetBackgroundColor(kSearchBoxBackground);
151 search_box_->set_placeholder_text_color(kHintTextColor); 161 search_box_->set_placeholder_text_color(kHintTextColor);
152 search_box_->set_controller(this); 162 search_box_->set_controller(this);
153 search_box_->SetTextInputType(ui::TEXT_INPUT_TYPE_SEARCH); 163 search_box_->SetTextInputType(ui::TEXT_INPUT_TYPE_SEARCH);
154 search_box_->SetTextInputFlags(ui::TEXT_INPUT_FLAG_AUTOCORRECT_OFF); 164 search_box_->SetTextInputFlags(ui::TEXT_INPUT_FLAG_AUTOCORRECT_OFF);
155 content_container_->AddChildView(search_box_); 165 content_container_->AddChildView(search_box_);
156 layout->SetFlexForView(search_box_, 1); 166 layout->SetFlexForView(search_box_, 1);
157 167
158 view_delegate_->GetSpeechUI()->AddObserver(this); 168 view_delegate_->GetSpeechUI()->AddObserver(this);
159 ModelChanged(); 169 ModelChanged();
170 is_fullscreen_enabled_ = features::IsFullscreenAppListEnabled();
vadimt 2017/05/26 17:58:55 const
newcomer 2017/05/26 23:20:22 Done, in the header line 127.
160 } 171 }
161 172
162 SearchBoxView::~SearchBoxView() { 173 SearchBoxView::~SearchBoxView() {
163 view_delegate_->GetSpeechUI()->RemoveObserver(this); 174 view_delegate_->GetSpeechUI()->RemoveObserver(this);
164 model_->search_box()->RemoveObserver(this); 175 model_->search_box()->RemoveObserver(this);
165 } 176 }
166 177
167 void SearchBoxView::ModelChanged() { 178 void SearchBoxView::ModelChanged() {
168 if (model_) 179 if (model_)
169 model_->search_box()->RemoveObserver(this); 180 model_->search_box()->RemoveObserver(this);
(...skipping 11 matching lines...) Expand all
181 192
182 void SearchBoxView::ClearSearch() { 193 void SearchBoxView::ClearSearch() {
183 search_box_->SetText(base::string16()); 194 search_box_->SetText(base::string16());
184 view_delegate_->AutoLaunchCanceled(); 195 view_delegate_->AutoLaunchCanceled();
185 // Updates model and fires query changed manually because SetText() above 196 // Updates model and fires query changed manually because SetText() above
186 // does not generate ContentsChanged() notification. 197 // does not generate ContentsChanged() notification.
187 UpdateModel(); 198 UpdateModel();
188 NotifyQueryChanged(); 199 NotifyQueryChanged();
189 } 200 }
190 201
202 void SearchBoxView::SetAppListView(AppListView* app_list_view) {
203 app_list_view_ = app_list_view;
204 }
205
191 void SearchBoxView::SetShadow(const gfx::ShadowValue& shadow) { 206 void SearchBoxView::SetShadow(const gfx::ShadowValue& shadow) {
192 SetBorder(base::MakeUnique<views::ShadowBorder>(shadow)); 207 SetBorder(base::MakeUnique<views::ShadowBorder>(shadow));
193 Layout(); 208 Layout();
194 } 209 }
195 210
196 gfx::Rect SearchBoxView::GetViewBoundsForSearchBoxContentsBounds( 211 gfx::Rect SearchBoxView::GetViewBoundsForSearchBoxContentsBounds(
197 const gfx::Rect& rect) const { 212 const gfx::Rect& rect) const {
198 gfx::Rect view_bounds = rect; 213 gfx::Rect view_bounds = rect;
199 view_bounds.Inset(-GetInsets()); 214 view_bounds.Inset(-GetInsets());
200 return view_bounds; 215 return view_bounds;
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
280 return; 295 return;
281 296
282 base::string16 back_button_label(l10n_util::GetStringUTF16( 297 base::string16 back_button_label(l10n_util::GetStringUTF16(
283 folder ? IDS_APP_LIST_FOLDER_CLOSE_FOLDER_ACCESSIBILE_NAME 298 folder ? IDS_APP_LIST_FOLDER_CLOSE_FOLDER_ACCESSIBILE_NAME
284 : IDS_APP_LIST_BACK)); 299 : IDS_APP_LIST_BACK));
285 back_button_->SetAccessibleName(back_button_label); 300 back_button_->SetAccessibleName(back_button_label);
286 back_button_->SetTooltipText(back_button_label); 301 back_button_->SetTooltipText(back_button_label);
287 } 302 }
288 303
289 gfx::Size SearchBoxView::GetPreferredSize() const { 304 gfx::Size SearchBoxView::GetPreferredSize() const {
290 return gfx::Size(kPreferredWidth, kPreferredHeight); 305 return gfx::Size(
306 is_fullscreen_enabled_ ? kPreferredWidthFullscreen : kPreferredWidth,
307 kPreferredHeight);
291 } 308 }
292 309
293 bool SearchBoxView::OnMouseWheel(const ui::MouseWheelEvent& event) { 310 bool SearchBoxView::OnMouseWheel(const ui::MouseWheelEvent& event) {
294 if (contents_view_) 311 if (contents_view_)
295 return contents_view_->OnMouseWheel(event); 312 return contents_view_->OnMouseWheel(event);
296 313
297 return false; 314 return false;
298 } 315 }
299 316
300 void SearchBoxView::OnEnabledChanged() { 317 void SearchBoxView::OnEnabledChanged() {
(...skipping 17 matching lines...) Expand all
318 void SearchBoxView::NotifyQueryChanged() { 335 void SearchBoxView::NotifyQueryChanged() {
319 DCHECK(delegate_); 336 DCHECK(delegate_);
320 delegate_->QueryChanged(this); 337 delegate_->QueryChanged(this);
321 } 338 }
322 339
323 void SearchBoxView::ContentsChanged(views::Textfield* sender, 340 void SearchBoxView::ContentsChanged(views::Textfield* sender,
324 const base::string16& new_contents) { 341 const base::string16& new_contents) {
325 UpdateModel(); 342 UpdateModel();
326 view_delegate_->AutoLaunchCanceled(); 343 view_delegate_->AutoLaunchCanceled();
327 NotifyQueryChanged(); 344 NotifyQueryChanged();
345
346 if (is_fullscreen_enabled_ && !app_list_view_->IsFullscreen()) {
347 // If the app list is in the peeking state, switch it to fullscreen.
348 app_list_view_->ToFullscreen();
349 }
328 } 350 }
329 351
330 bool SearchBoxView::HandleKeyEvent(views::Textfield* sender, 352 bool SearchBoxView::HandleKeyEvent(views::Textfield* sender,
331 const ui::KeyEvent& key_event) { 353 const ui::KeyEvent& key_event) {
332 if (key_event.type() == ui::ET_KEY_PRESSED) { 354 if (key_event.type() == ui::ET_KEY_PRESSED) {
333 if (key_event.key_code() == ui::VKEY_TAB && 355 if (key_event.key_code() == ui::VKEY_TAB &&
334 focused_view_ != FOCUS_CONTENTS_VIEW && 356 focused_view_ != FOCUS_CONTENTS_VIEW &&
335 MoveTabFocus(key_event.IsShiftDown())) 357 MoveTabFocus(key_event.IsShiftDown()))
336 return true; 358 return true;
337 359
(...skipping 95 matching lines...) Expand 10 before | Expand all | Expand 10 after
433 NotifyQueryChanged(); 455 NotifyQueryChanged();
434 } 456 }
435 457
436 void SearchBoxView::OnSpeechRecognitionStateChanged( 458 void SearchBoxView::OnSpeechRecognitionStateChanged(
437 SpeechRecognitionState new_state) { 459 SpeechRecognitionState new_state) {
438 SpeechRecognitionButtonPropChanged(); 460 SpeechRecognitionButtonPropChanged();
439 SchedulePaint(); 461 SchedulePaint();
440 } 462 }
441 463
442 } // namespace app_list 464 } // namespace app_list
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698