OLD | NEW |
---|---|
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 "chrome/browser/ui/views/find_bar_view.h" | 5 #include "chrome/browser/ui/views/find_bar_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/i18n/number_formatting.h" | 9 #include "base/i18n/number_formatting.h" |
10 #include "base/macros.h" | 10 #include "base/macros.h" |
11 #include "base/memory/ptr_util.h" | 11 #include "base/memory/ptr_util.h" |
12 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
13 #include "chrome/app/vector_icons/vector_icons.h" | 13 #include "chrome/app/vector_icons/vector_icons.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/themes/theme_properties.h" | 15 #include "chrome/browser/themes/theme_properties.h" |
16 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 16 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
17 #include "chrome/browser/ui/find_bar/find_bar_state.h" | 17 #include "chrome/browser/ui/find_bar/find_bar_state.h" |
18 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h" | 18 #include "chrome/browser/ui/find_bar/find_bar_state_factory.h" |
19 #include "chrome/browser/ui/find_bar/find_notification_details.h" | 19 #include "chrome/browser/ui/find_bar/find_notification_details.h" |
20 #include "chrome/browser/ui/find_bar/find_tab_helper.h" | 20 #include "chrome/browser/ui/find_bar/find_tab_helper.h" |
21 #include "chrome/browser/ui/view_ids.h" | 21 #include "chrome/browser/ui/view_ids.h" |
22 #include "chrome/browser/ui/views/find_bar_host.h" | 22 #include "chrome/browser/ui/views/find_bar_host.h" |
23 #include "chrome/browser/ui/views/frame/browser_view.h" | 23 #include "chrome/browser/ui/views/frame/browser_view.h" |
24 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h" | |
24 #include "chrome/grit/generated_resources.h" | 25 #include "chrome/grit/generated_resources.h" |
25 #include "components/strings/grit/components_strings.h" | 26 #include "components/strings/grit/components_strings.h" |
26 #include "ui/base/ime/input_method.h" | 27 #include "ui/base/ime/input_method.h" |
27 #include "ui/base/ime/text_input_flags.h" | 28 #include "ui/base/ime/text_input_flags.h" |
28 #include "ui/base/l10n/l10n_util.h" | 29 #include "ui/base/l10n/l10n_util.h" |
29 #include "ui/base/theme_provider.h" | 30 #include "ui/base/theme_provider.h" |
30 #include "ui/events/event.h" | 31 #include "ui/events/event.h" |
31 #include "ui/gfx/color_palette.h" | 32 #include "ui/gfx/color_palette.h" |
32 #include "ui/gfx/geometry/insets.h" | 33 #include "ui/gfx/geometry/insets.h" |
33 #include "ui/gfx/paint_vector_icon.h" | 34 #include "ui/gfx/paint_vector_icon.h" |
34 #include "ui/native_theme/native_theme.h" | 35 #include "ui/native_theme/native_theme.h" |
35 #include "ui/vector_icons/vector_icons.h" | 36 #include "ui/vector_icons/vector_icons.h" |
36 #include "ui/views/background.h" | 37 #include "ui/views/background.h" |
37 #include "ui/views/border.h" | 38 #include "ui/views/border.h" |
38 #include "ui/views/bubble/bubble_border.h" | 39 #include "ui/views/bubble/bubble_border.h" |
39 #include "ui/views/controls/button/image_button.h" | 40 #include "ui/views/controls/button/image_button.h" |
40 #include "ui/views/controls/button/image_button_factory.h" | 41 #include "ui/views/controls/button/image_button_factory.h" |
41 #include "ui/views/controls/label.h" | 42 #include "ui/views/controls/label.h" |
42 #include "ui/views/controls/separator.h" | 43 #include "ui/views/controls/separator.h" |
43 #include "ui/views/layout/box_layout.h" | 44 #include "ui/views/layout/box_layout.h" |
44 #include "ui/views/painter.h" | 45 #include "ui/views/painter.h" |
46 #include "ui/views/view_properties.h" | |
45 #include "ui/views/view_targeter.h" | 47 #include "ui/views/view_targeter.h" |
46 #include "ui/views/widget/widget.h" | 48 #include "ui/views/widget/widget.h" |
47 | 49 |
48 namespace { | 50 namespace { |
49 | 51 |
50 // These layout constants are all in dp. | |
51 // The horizontal and vertical insets for the bar. | |
52 const int kInteriorPadding = 8; | |
53 // Default spacing between child views. | |
54 const int kInterChildSpacing = 4; | |
55 // Additional spacing around the separator. | |
56 const int kSeparatorLeftSpacing = 12 - kInterChildSpacing; | |
57 const int kSeparatorRightSpacing = 8 - kInterChildSpacing; | |
58 | |
59 // The default number of average characters that the text box will be. | 52 // The default number of average characters that the text box will be. |
60 const int kDefaultCharWidth = 30; | 53 const int kDefaultCharWidth = 30; |
61 | 54 |
62 // The match count label is like a normal label, but can process events (which | 55 // The match count label is like a normal label, but can process events (which |
63 // makes it easier to forward events to the text input --- see | 56 // makes it easier to forward events to the text input --- see |
64 // FindBarView::TargetForRect). | 57 // FindBarView::TargetForRect). |
65 class MatchCountLabel : public views::Label { | 58 class MatchCountLabel : public views::Label { |
66 public: | 59 public: |
67 MatchCountLabel() {} | 60 MatchCountLabel() {} |
68 ~MatchCountLabel() override {} | 61 ~MatchCountLabel() override {} |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
154 AddChildView(close_button_); | 147 AddChildView(close_button_); |
155 | 148 |
156 AddChildView(focus_forwarder_view_); | 149 AddChildView(focus_forwarder_view_); |
157 | 150 |
158 EnableCanvasFlippingForRTLUI(true); | 151 EnableCanvasFlippingForRTLUI(true); |
159 | 152 |
160 match_count_text_->SetEventTargeter( | 153 match_count_text_->SetEventTargeter( |
161 base::MakeUnique<views::ViewTargeter>(this)); | 154 base::MakeUnique<views::ViewTargeter>(this)); |
162 AddChildViewAt(match_count_text_, 1); | 155 AddChildViewAt(match_count_text_, 1); |
163 | 156 |
164 separator_->SetBorder(views::CreateEmptyBorder(0, kSeparatorLeftSpacing, 0, | |
165 kSeparatorRightSpacing)); | |
166 AddChildViewAt(separator_, 2); | 157 AddChildViewAt(separator_, 2); |
167 | 158 |
159 ChromeLayoutProvider* provider = ChromeLayoutProvider::Get(); | |
160 | |
161 find_next_button_->SetProperty(views::kMarginsKey, new gfx::Insets( | |
162 provider->GetDistanceMetric(DISTANCE_TOAST_CONTROL_VERTICAL), 0)); | |
163 close_button_->SetProperty(views::kMarginsKey, new gfx::Insets( | |
164 provider->GetDistanceMetric(DISTANCE_TOAST_CONTROL_VERTICAL), 0)); | |
165 find_text_->SetProperty(views::kMarginsKey, new gfx::Insets( | |
166 provider->GetDistanceMetric(DISTANCE_TOAST_CONTROL_VERTICAL), 0)); | |
167 match_count_text_->SetProperty(views::kMarginsKey, new gfx::Insets( | |
168 provider->GetDistanceMetric(DISTANCE_TOAST_LABEL_VERTICAL), 0)); | |
169 separator_->SetProperty(views::kMarginsKey, new gfx::Insets( | |
170 provider->GetDistanceMetric(DISTANCE_TOAST_LABEL_VERTICAL), 0)); | |
171 | |
168 find_text_->SetBorder(views::NullBorder()); | 172 find_text_->SetBorder(views::NullBorder()); |
169 | 173 |
170 views::BoxLayout* manager = | 174 views::BoxLayout* manager = |
171 new views::BoxLayout(views::BoxLayout::kHorizontal, | 175 new views::BoxLayout(views::BoxLayout::kHorizontal, |
172 gfx::Insets(kInteriorPadding), kInterChildSpacing); | 176 provider->GetInsetsMetric(views::INSETS_TOAST), |
177 provider->GetDistanceMetric( | |
178 views::DISTANCE_RELATED_CONTROL_HORIZONTAL)); | |
173 SetLayoutManager(manager); | 179 SetLayoutManager(manager); |
174 manager->SetFlexForView(find_text_, 1); | 180 manager->SetFlexForView(find_text_, 1); |
175 } | 181 } |
176 | 182 |
177 FindBarView::~FindBarView() { | 183 FindBarView::~FindBarView() { |
178 } | 184 } |
179 | 185 |
180 void FindBarView::SetFindTextAndSelectedRange( | 186 void FindBarView::SetFindTextAndSelectedRange( |
181 const base::string16& find_text, | 187 const base::string16& find_text, |
182 const gfx::Range& selected_range) { | 188 const gfx::Range& selected_range) { |
(...skipping 30 matching lines...) Expand all Loading... | |
213 find_text_->SelectAll(true); | 219 find_text_->SelectAll(true); |
214 } | 220 } |
215 | 221 |
216 if (find_text.empty() || !have_valid_range) { | 222 if (find_text.empty() || !have_valid_range) { |
217 // If there was no text entered, we don't show anything in the result count | 223 // If there was no text entered, we don't show anything in the result count |
218 // area. | 224 // area. |
219 ClearMatchCount(); | 225 ClearMatchCount(); |
220 return; | 226 return; |
221 } | 227 } |
222 | 228 |
223 match_count_text_->SetText(l10n_util::GetStringFUTF16( | 229 match_count_text_->SetText( |
224 IDS_FIND_IN_PAGE_COUNT, base::FormatNumber(result.active_match_ordinal()), | 230 base::FormatNumber(result.active_match_ordinal()) |
225 base::FormatNumber(result.number_of_matches()))); | 231 + L"/" + base::FormatNumber(result.number_of_matches())); |
Peter Kasting
2017/07/13 06:05:35
This isn't localizable. You need to change IDS_FI
ananta
2017/07/13 06:27:42
Thanks for catching this. Dunno how I assumed that
| |
226 | 232 |
227 UpdateMatchCountAppearance(result.number_of_matches() == 0 && | 233 UpdateMatchCountAppearance(result.number_of_matches() == 0 && |
228 result.final_update()); | 234 result.final_update()); |
229 | 235 |
230 // The match_count label may have increased/decreased in size so we need to | 236 // The match_count label may have increased/decreased in size so we need to |
231 // do a layout and repaint the dialog so that the find text field doesn't | 237 // do a layout and repaint the dialog so that the find text field doesn't |
232 // partially overlap the match-count label when it increases on no matches. | 238 // partially overlap the match-count label when it increases on no matches. |
233 Layout(); | 239 Layout(); |
234 SchedulePaint(); | 240 SchedulePaint(); |
235 } | 241 } |
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
416 separator_->SetColor(SkColorSetA(text_color, 0x26)); | 422 separator_->SetColor(SkColorSetA(text_color, 0x26)); |
417 | 423 |
418 const SkColor base_icon_color = GetNativeTheme()->GetSystemColor( | 424 const SkColor base_icon_color = GetNativeTheme()->GetSystemColor( |
419 ui::NativeTheme::kColorId_TextfieldDefaultColor); | 425 ui::NativeTheme::kColorId_TextfieldDefaultColor); |
420 views::SetImageFromVectorIcon(find_previous_button_, kCaretUpIcon, | 426 views::SetImageFromVectorIcon(find_previous_button_, kCaretUpIcon, |
421 base_icon_color); | 427 base_icon_color); |
422 views::SetImageFromVectorIcon(find_next_button_, kCaretDownIcon, | 428 views::SetImageFromVectorIcon(find_next_button_, kCaretDownIcon, |
423 base_icon_color); | 429 base_icon_color); |
424 views::SetImageFromVectorIcon(close_button_, ui::kCloseIcon, base_icon_color); | 430 views::SetImageFromVectorIcon(close_button_, ui::kCloseIcon, base_icon_color); |
425 } | 431 } |
OLD | NEW |