| 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 "ui/views/controls/label.h" | 5 #include "ui/views/controls/label.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <algorithm> | 9 #include <algorithm> |
| 10 #include <cmath> | 10 #include <cmath> |
| 11 #include <limits> | 11 #include <limits> |
| 12 #include <utility> | 12 #include <utility> |
| 13 #include <vector> | 13 #include <vector> |
| 14 | 14 |
| 15 #include "base/i18n/rtl.h" | 15 #include "base/i18n/rtl.h" |
| 16 #include "base/logging.h" | 16 #include "base/logging.h" |
| 17 #include "base/profiler/scoped_tracker.h" | 17 #include "base/profiler/scoped_tracker.h" |
| 18 #include "base/strings/string_split.h" | 18 #include "base/strings/string_split.h" |
| 19 #include "base/strings/utf_string_conversions.h" | 19 #include "base/strings/utf_string_conversions.h" |
| 20 #include "ui/accessibility/ax_view_state.h" | 20 #include "ui/accessibility/ax_view_state.h" |
| 21 #include "ui/base/default_style.h" | 21 #include "ui/base/default_style.h" |
| 22 #include "ui/base/material_design/material_design_controller.h" |
| 22 #include "ui/base/resource/resource_bundle.h" | 23 #include "ui/base/resource/resource_bundle.h" |
| 23 #include "ui/gfx/canvas.h" | 24 #include "ui/gfx/canvas.h" |
| 24 #include "ui/gfx/color_utils.h" | 25 #include "ui/gfx/color_utils.h" |
| 25 #include "ui/gfx/geometry/insets.h" | 26 #include "ui/gfx/geometry/insets.h" |
| 26 #include "ui/gfx/text_elider.h" | 27 #include "ui/gfx/text_elider.h" |
| 27 #include "ui/native_theme/native_theme.h" | 28 #include "ui/native_theme/native_theme.h" |
| 28 | 29 |
| 29 namespace views { | 30 namespace views { |
| 30 namespace { | 31 namespace { |
| 31 | 32 |
| (...skipping 339 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 371 // TODO(ckocagil): Remove ScopedTracker below once crbug.com/441028 is | 372 // TODO(ckocagil): Remove ScopedTracker below once crbug.com/441028 is |
| 372 // fixed. | 373 // fixed. |
| 373 tracked_objects::ScopedTracker tracking_profile( | 374 tracked_objects::ScopedTracker tracking_profile( |
| 374 FROM_HERE_WITH_EXPLICIT_FUNCTION("441028 First PaintText()")); | 375 FROM_HERE_WITH_EXPLICIT_FUNCTION("441028 First PaintText()")); |
| 375 | 376 |
| 376 is_first_paint_text_ = false; | 377 is_first_paint_text_ = false; |
| 377 PaintText(canvas); | 378 PaintText(canvas); |
| 378 } else { | 379 } else { |
| 379 PaintText(canvas); | 380 PaintText(canvas); |
| 380 } | 381 } |
| 381 if (HasFocus()) | 382 if (HasFocus() && !ui::MaterialDesignController::IsSecondaryUiMaterial()) |
| 382 canvas->DrawFocusRect(GetFocusBounds()); | 383 canvas->DrawFocusRect(GetFocusBounds()); |
| 383 } | 384 } |
| 384 | 385 |
| 385 void Label::OnNativeThemeChanged(const ui::NativeTheme* theme) { | 386 void Label::OnNativeThemeChanged(const ui::NativeTheme* theme) { |
| 386 UpdateColorsFromTheme(theme); | 387 UpdateColorsFromTheme(theme); |
| 387 } | 388 } |
| 388 | 389 |
| 389 void Label::OnDeviceScaleFactorChanged(float device_scale_factor) { | 390 void Label::OnDeviceScaleFactorChanged(float device_scale_factor) { |
| 390 View::OnDeviceScaleFactorChanged(device_scale_factor); | 391 View::OnDeviceScaleFactorChanged(device_scale_factor); |
| 391 // When the device scale factor is changed, some font rendering parameters is | 392 // When the device scale factor is changed, some font rendering parameters is |
| (...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 587 } | 588 } |
| 588 | 589 |
| 589 bool Label::ShouldShowDefaultTooltip() const { | 590 bool Label::ShouldShowDefaultTooltip() const { |
| 590 const gfx::Size text_size = GetTextSize(); | 591 const gfx::Size text_size = GetTextSize(); |
| 591 const gfx::Size size = GetContentsBounds().size(); | 592 const gfx::Size size = GetContentsBounds().size(); |
| 592 return !obscured() && (text_size.width() > size.width() || | 593 return !obscured() && (text_size.width() > size.width() || |
| 593 (multi_line() && text_size.height() > size.height())); | 594 (multi_line() && text_size.height() > size.height())); |
| 594 } | 595 } |
| 595 | 596 |
| 596 } // namespace views | 597 } // namespace views |
| OLD | NEW |