diff options
| author | dan sinclair <dsinclair@chromium.org> | 2017-07-12 21:56:27 -0400 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-07-13 17:11:16 +0000 |
| commit | adf922f278d23e7f955b89f48cc64b5de7925977 (patch) | |
| tree | 1cae79929399b712938d88480d90ebc2c7ea59ff /fpdfsdk/pdfwindow/cpwl_list_box.cpp | |
| parent | a860a3d596f3daeadfdca0cc2093bfca722fa3a3 (diff) | |
| download | pdfium-adf922f278d23e7f955b89f48cc64b5de7925977.tar.xz | |
Remove CPWL_Utils::{In,De}flateRect
This CL removes the custom InflateRect and Deflate rect code in CPWL_Utils in
favour of calling the CFX_FloatRect version. This required inlining some extra
code at each callsite to check the rect size and normalize.
Change-Id: I7f60e5de03fc1db0c1d8e51eaa1d0e0700ebf157
Reviewed-on: https://pdfium-review.googlesource.com/7710
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/pdfwindow/cpwl_list_box.cpp')
| -rw-r--r-- | fpdfsdk/pdfwindow/cpwl_list_box.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/fpdfsdk/pdfwindow/cpwl_list_box.cpp b/fpdfsdk/pdfwindow/cpwl_list_box.cpp index 61f9aafa8f..79559d33f0 100644 --- a/fpdfsdk/pdfwindow/cpwl_list_box.cpp +++ b/fpdfsdk/pdfwindow/cpwl_list_box.cpp @@ -405,8 +405,13 @@ float CPWL_ListBox::GetFirstHeight() const { } CFX_FloatRect CPWL_ListBox::GetListRect() const { - return CPWL_Utils::DeflateRect( - GetWindowRect(), (float)(GetBorderWidth() + GetInnerBorderWidth())); + CFX_FloatRect rect = GetWindowRect(); + if (!rect.IsEmpty()) { + float width = static_cast<float>(GetBorderWidth() + GetInnerBorderWidth()); + rect.Deflate(width, width); + rect.Normalize(); + } + return rect; } bool CPWL_ListBox::OnMouseWheel(short zDelta, |