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

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

Issue 2713993005: Clean up ImageView. (Closed)
Patch Set: revert errant changes Created 3 years, 9 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/search_result_view.cc ('k') | ui/views/controls/button/label_button.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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/tile_item_view.h" 5 #include "ui/app_list/views/tile_item_view.h"
6 6
7 #include "ui/app_list/app_list_constants.h" 7 #include "ui/app_list/app_list_constants.h"
8 #include "ui/app_list/views/app_list_main_view.h" 8 #include "ui/app_list/views/app_list_main_view.h"
9 #include "ui/views/background.h" 9 #include "ui/views/background.h"
10 #include "ui/views/controls/image_view.h" 10 #include "ui/views/controls/image_view.h"
(...skipping 10 matching lines...) Expand all
21 21
22 namespace app_list { 22 namespace app_list {
23 23
24 TileItemView::TileItemView() 24 TileItemView::TileItemView()
25 : views::CustomButton(this), 25 : views::CustomButton(this),
26 parent_background_color_(SK_ColorTRANSPARENT), 26 parent_background_color_(SK_ColorTRANSPARENT),
27 icon_(new views::ImageView), 27 icon_(new views::ImageView),
28 title_(new views::Label), 28 title_(new views::Label),
29 selected_(false) { 29 selected_(false) {
30 // Prevent the icon view from interfering with our mouse events. 30 // Prevent the icon view from interfering with our mouse events.
31 icon_->set_interactive(false); 31 icon_->set_can_process_events_within_subtree(false);
32 icon_->SetVerticalAlignment(views::ImageView::LEADING); 32 icon_->SetVerticalAlignment(views::ImageView::LEADING);
33 33
34 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 34 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
35 title_->SetAutoColorReadabilityEnabled(false); 35 title_->SetAutoColorReadabilityEnabled(false);
36 title_->SetEnabledColor(kGridTitleColor); 36 title_->SetEnabledColor(kGridTitleColor);
37 title_->SetFontList(rb.GetFontList(kItemTextFontStyle)); 37 title_->SetFontList(rb.GetFontList(kItemTextFontStyle));
38 title_->SetHorizontalAlignment(gfx::ALIGN_CENTER); 38 title_->SetHorizontalAlignment(gfx::ALIGN_CENTER);
39 title_->SetHandlesTooltips(false); 39 title_->SetHandlesTooltips(false);
40 40
41 AddChildView(icon_); 41 AddChildView(icon_);
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
145 // truncation in making the tooltip. We do not want the label itself to have a 145 // truncation in making the tooltip. We do not want the label itself to have a
146 // tooltip, so we only temporarily enable it to get the tooltip text from the 146 // tooltip, so we only temporarily enable it to get the tooltip text from the
147 // label, then disable it again. 147 // label, then disable it again.
148 title_->SetHandlesTooltips(true); 148 title_->SetHandlesTooltips(true);
149 bool handled = title_->GetTooltipText(p, tooltip); 149 bool handled = title_->GetTooltipText(p, tooltip);
150 title_->SetHandlesTooltips(false); 150 title_->SetHandlesTooltips(false);
151 return handled; 151 return handled;
152 } 152 }
153 153
154 } // namespace app_list 154 } // namespace app_list
OLDNEW
« no previous file with comments | « ui/app_list/views/search_result_view.cc ('k') | ui/views/controls/button/label_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698