From 43ac44cbf52076fd2354d5276c95d5b4b4a06d64 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Thu, 8 Dec 2016 14:05:14 -0800 Subject: Cleanup CFWL_Widget code to return CFX_RectFs where appropriate This Cl changes the various Get*Rect methods in CFWL_Widget to return CFX_RectF classes instead of taking an out parameter. The Repaint method is split into Repaint() and RepaintRect() in order to change the param to a const CFX_RectF& from a CFX_RectF*. Review-Url: https://codereview.chromium.org/2560873005 --- xfa/fwl/cfwl_scrollbar.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'xfa/fwl/cfwl_scrollbar.cpp') diff --git a/xfa/fwl/cfwl_scrollbar.cpp b/xfa/fwl/cfwl_scrollbar.cpp index d6124c6515..a8e4447263 100644 --- a/xfa/fwl/cfwl_scrollbar.cpp +++ b/xfa/fwl/cfwl_scrollbar.cpp @@ -157,7 +157,7 @@ void CFWL_ScrollBar::Layout() { part.m_pWidget = this; m_fMinThumb = *static_cast( pTheme->GetCapacity(&part, CFWL_WidgetCapacity::Size)); - GetClientRect(m_rtClient); + m_rtClient = GetClientRect(); CalcButtonLen(); CalcMinButtonRect(m_rtMinBtn); CalcMaxButtonRect(m_rtMaxBtn); @@ -433,7 +433,7 @@ void CFWL_ScrollBar::DoMouseDown(int32_t iItem, return; iState = CFWL_PartState_Pressed; - Repaint(&rtItem); + RepaintRect(rtItem); } void CFWL_ScrollBar::DoMouseUp(int32_t iItem, @@ -447,7 +447,7 @@ void CFWL_ScrollBar::DoMouseUp(int32_t iItem, return; iState = iNewState; - Repaint(&rtItem); + RepaintRect(rtItem); OnScroll(CFWL_EventScroll::Code::EndScroll, m_fTrackPos); } @@ -463,7 +463,7 @@ void CFWL_ScrollBar::DoMouseMove(int32_t iItem, return; iState = iNewState; - Repaint(&rtItem); + RepaintRect(rtItem); } else if ((2 == iItem) && (m_iThumbButtonState == CFWL_PartState_Pressed)) { FX_FLOAT fPos = GetTrackPointPos(fx, fy); m_fTrackPos = fPos; @@ -478,7 +478,7 @@ void CFWL_ScrollBar::DoMouseLeave(int32_t iItem, return; iState = CFWL_PartState_Normal; - Repaint(&rtItem); + RepaintRect(rtItem); } void CFWL_ScrollBar::DoMouseHover(int32_t iItem, @@ -488,7 +488,7 @@ void CFWL_ScrollBar::DoMouseHover(int32_t iItem, return; iState = CFWL_PartState_Hovered; - Repaint(&rtItem); + RepaintRect(rtItem); } CFWL_ScrollBar::Timer::Timer(CFWL_ScrollBar* pToolTip) : CFWL_Timer(pToolTip) {} -- cgit v1.2.3