summaryrefslogtreecommitdiff
path: root/fpdfsdk/fxedit/fxet_list.h
diff options
context:
space:
mode:
authorDan Sinclair <dsinclair@chromium.org>2017-07-20 12:01:21 -0400
committerChromium commit bot <commit-bot@chromium.org>2017-07-20 20:56:41 +0000
commit1a44cb4be8b60b706990cf8113abea6937aa1653 (patch)
tree8b28718a965888f0f1bd59b6c1a508dde6fdb534 /fpdfsdk/fxedit/fxet_list.h
parent3f753f20e9c51f7170a616a355b3f9578505c0ee (diff)
downloadpdfium-1a44cb4be8b60b706990cf8113abea6937aa1653.tar.xz
Convert CFX_ListItem to use CFX_FloatRect
The CFX_ListItem never calls the Height() method so doesn't need to use CLST_Rect. This CL removes unused methods from CLST_Rect and CPVT_FloatRect. Change-Id: I82d4f07ec104345e9275ccd838e3c8eed1de7a50 Reviewed-on: https://pdfium-review.googlesource.com/8431 Reviewed-by: Henrique Nakashima <hnakashima@chromium.org> Commit-Queue: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'fpdfsdk/fxedit/fxet_list.h')
-rw-r--r--fpdfsdk/fxedit/fxet_list.h57
1 files changed, 3 insertions, 54 deletions
diff --git a/fpdfsdk/fxedit/fxet_list.h b/fpdfsdk/fxedit/fxet_list.h
index b4b0a56c1e..b34cc54830 100644
--- a/fpdfsdk/fxedit/fxet_list.h
+++ b/fpdfsdk/fxedit/fxet_list.h
@@ -42,62 +42,11 @@ class CLST_Rect : public CFX_FloatRect {
~CLST_Rect() {}
- void Default() { left = top = right = bottom = 0.0f; }
-
- const CLST_Rect operator=(const CFX_FloatRect& rect) {
- left = rect.left;
- top = rect.top;
- right = rect.right;
- bottom = rect.bottom;
-
- return *this;
- }
-
- bool operator==(const CLST_Rect& rect) const {
- return memcmp(this, &rect, sizeof(CLST_Rect)) == 0;
- }
-
- bool operator!=(const CLST_Rect& rect) const { return !(*this == rect); }
-
- float Width() const { return right - left; }
-
float Height() const {
if (top > bottom)
return top - bottom;
return bottom - top;
}
-
- CFX_PointF LeftTop() const { return CFX_PointF(left, top); }
-
- CFX_PointF RightBottom() const { return CFX_PointF(right, bottom); }
-
- const CLST_Rect operator+=(const CFX_PointF& point) {
- left += point.x;
- right += point.x;
- top += point.y;
- bottom += point.y;
-
- return *this;
- }
-
- const CLST_Rect operator-=(const CFX_PointF& point) {
- left -= point.x;
- right -= point.x;
- top -= point.y;
- bottom -= point.y;
-
- return *this;
- }
-
- CLST_Rect operator+(const CFX_PointF& point) const {
- return CLST_Rect(left + point.x, top + point.y, right + point.x,
- bottom + point.y);
- }
-
- CLST_Rect operator-(const CFX_PointF& point) const {
- return CLST_Rect(left - point.x, top - point.y, right - point.x,
- bottom - point.y);
- }
};
class CFX_ListItem final {
@@ -108,13 +57,13 @@ class CFX_ListItem final {
void SetFontMap(IPVT_FontMap* pFontMap);
CFX_Edit* GetEdit() const;
- void SetRect(const CLST_Rect& rect);
+ void SetRect(const CFX_FloatRect& rect);
void SetSelect(bool bSelected);
void SetText(const CFX_WideString& text);
void SetFontSize(float fFontSize);
CFX_WideString GetText() const;
- CLST_Rect GetRect() const;
+ CFX_FloatRect GetRect() const;
bool IsSelected() const;
float GetItemHeight() const;
uint16_t GetFirstChar() const;
@@ -124,7 +73,7 @@ class CFX_ListItem final {
std::unique_ptr<CFX_Edit> m_pEdit;
bool m_bSelected;
- CLST_Rect m_rcListItem;
+ CFX_FloatRect m_rcListItem;
};
class CFX_ListContainer {