Convert GetWidgetRect to return rect.

xfa/fwl/core/cfwl_edit.cpp

 // Copyright 2014 PDFium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Original code copyright 2014 Foxit Software Inc. http://www.foxitsoftware.com
 
 #include "xfa/fwl/core/cfwl_edit.h"
 
 #include <algorithm>
 #include <memory>
@@ skipping 71 matching lines @@
 CFWL_Edit::~CFWL_Edit() {
   if (m_pProperties->m_dwStates & FWL_WGTSTATE_Focused)
     HideCaret(nullptr);
   ClearRecord();
 }
 
 FWL_Type CFWL_Edit::GetClassID() const {
   return FWL_Type::Edit;
 }
 
-void CFWL_Edit::GetWidgetRect(CFX_RectF& rect, bool bAutoSize) {
-  if (!bAutoSize) {
-    rect = m_pProperties->m_rtWidget;
-    if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_OuterScrollbar) {
-      if (IsShowScrollBar(true)) {
-        FX_FLOAT* pfWidth = static_cast<FX_FLOAT*>(
-            GetThemeCapacity(CFWL_WidgetCapacity::ScrollBarWidth));
-        rect.width += *pfWidth;
-        rect.width += kEditMargin;
-      }
-      if (IsShowScrollBar(false)) {
-        FX_FLOAT* pfWidth = static_cast<FX_FLOAT*>(
-            GetThemeCapacity(CFWL_WidgetCapacity::ScrollBarWidth));
-        rect.height += *pfWidth;
-        rect.height += kEditMargin;
-      }
+CFX_RectF CFWL_Edit::GetWidgetRect() {
+  CFX_RectF rect = m_pProperties->m_rtWidget;
+  if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_OuterScrollbar) {
+    if (IsShowScrollBar(true)) {
+      FX_FLOAT* pfWidth = static_cast<FX_FLOAT*>(
+          GetThemeCapacity(CFWL_WidgetCapacity::ScrollBarWidth));
+      rect.width += *pfWidth;
+      rect.width += kEditMargin;
     }
-    return;
+    if (IsShowScrollBar(false)) {
+      FX_FLOAT* pfWidth = static_cast<FX_FLOAT*>(
+          GetThemeCapacity(CFWL_WidgetCapacity::ScrollBarWidth));
+      rect.height += *pfWidth;
+      rect.height += kEditMargin;
+    }
   }
+  return rect;
+}
 
-  rect.Set(0, 0, 0, 0);
-
+CFX_RectF CFWL_Edit::GetAutosizedWidgetRect() {
+  CFX_RectF rect;
   int32_t iTextLen = m_EdtEngine.GetTextLength();

[Tom Sepez, 2016/12/07 21:53:20]

nit: local needed?

[dsinclair, 2016/12/08 02:35:06]

Done.

   if (iTextLen > 0) {
     CFX_WideString wsText = m_EdtEngine.GetText(0, -1);
     CFX_SizeF sz = CalcTextSize(
         wsText, m_pProperties->m_pThemeProvider,
         !!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine));
     rect.Set(0, 0, sz.x, sz.y);
   }
   InflateWidgetRect(rect);
+  return rect;
 }
 
 void CFWL_Edit::SetStates(uint32_t dwStates) {
   if ((m_pProperties->m_dwStates & FWL_WGTSTATE_Invisible) ||
       (m_pProperties->m_dwStates & FWL_WGTSTATE_Disabled)) {
     HideCaret(nullptr);
   }
   CFWL_Widget::SetStates(dwStates);
 }
 
 void CFWL_Edit::Update() {
   if (IsLocked())
     return;
   if (!m_pProperties->m_pThemeProvider)
     m_pProperties->m_pThemeProvider = GetAvailableTheme();
 
   Layout();
   if (m_rtClient.IsEmpty())
     return;
 
   UpdateEditEngine();
   UpdateVAlignment();
   UpdateScroll();
   InitCaret();
 }
 
 FWL_WidgetHit CFWL_Edit::HitTest(FX_FLOAT fx, FX_FLOAT fy) {
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_OuterScrollbar) {
     if (IsShowScrollBar(true)) {
-      CFX_RectF rect;
-      m_pVertScrollBar->GetWidgetRect(rect, false);
-      if (rect.Contains(fx, fy))
+      if (m_pVertScrollBar->GetWidgetRect().Contains(fx, fy))

[Tom Sepez, 2016/12/07 21:53:20]

nice.

[dsinclair, 2016/12/08 02:35:06]

Acknowledged.

         return FWL_WidgetHit::VScrollBar;
     }
     if (IsShowScrollBar(false)) {
-      CFX_RectF rect;
-      m_pHorzScrollBar->GetWidgetRect(rect, false);
-      if (rect.Contains(fx, fy))
+      if (m_pHorzScrollBar->GetWidgetRect().Contains(fx, fy))
         return FWL_WidgetHit::HScrollBar;
     }
   }
   if (m_rtClient.Contains(fx, fy))
     return FWL_WidgetHit::Edit;
   return FWL_WidgetHit::Unknown;
 }
 
 void CFWL_Edit::AddSpellCheckObj(CFX_Path& PathData,
                                  int32_t nStart,
@@ skipping 250 matching lines @@
     return;
 
   bool bRepaintContent = UpdateOffset();
   UpdateCaret();
   CFX_RectF rtInvalid;
   rtInvalid.Set(0, 0, 0, 0);
   bool bRepaintScroll = false;
   if (m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine) {
     CFWL_ScrollBar* pScroll = UpdateScroll();
     if (pScroll) {
-      pScroll->GetWidgetRect(rtInvalid, false);
+      rtInvalid = pScroll->GetWidgetRect();
       bRepaintScroll = true;
     }
   }
   if (bRepaintContent || bRepaintScroll) {
     if (bRepaintContent)
       rtInvalid.Union(m_rtEngine);
     Repaint(&rtInvalid);
   }
 }
 
@@ skipping 70 matching lines @@
   if (dwStates)
     param.m_dwStates = CFWL_PartState_Disabled;
   param.m_pGraphics = pGraphics;
   param.m_matrix = *pMatrix;
   param.m_rtPart = m_rtClient;
   pTheme->DrawBackground(&param);
 
   if (!IsShowScrollBar(true) || !IsShowScrollBar(false))
     return;
 
-  CFX_RectF rtScroll;
-  m_pHorzScrollBar->GetWidgetRect(rtScroll, false);
+  CFX_RectF rtScroll = m_pHorzScrollBar->GetWidgetRect();
 
   CFX_RectF rtStatic;
   rtStatic.Set(m_rtClient.right() - rtScroll.height,
                m_rtClient.bottom() - rtScroll.height, rtScroll.height,
                rtScroll.height);
   param.m_bStaticBackground = true;
   param.m_bMaximize = true;
   param.m_rtPart = rtStatic;
   pTheme->DrawBackground(&param);
 }
@@ skipping 362 matching lines @@
   if (!bShowHorz && !bShowVert)
     return nullptr;
 
   IFDE_TxtEdtPage* pPage = m_EdtEngine.GetPage(0);
   if (!pPage)
     return nullptr;
 
   const CFX_RectF& rtFDE = pPage->GetContentsBox();
   CFWL_ScrollBar* pRepaint = nullptr;
   if (bShowHorz) {
-    CFX_RectF rtScroll;
-    m_pHorzScrollBar->GetWidgetRect(rtScroll, false);
+    CFX_RectF rtScroll = m_pHorzScrollBar->GetWidgetRect();
     if (rtScroll.width < rtFDE.width) {
       m_pHorzScrollBar->LockUpdate();
       FX_FLOAT fRange = rtFDE.width - rtScroll.width;
       m_pHorzScrollBar->SetRange(0.0f, fRange);
 
       FX_FLOAT fPos = std::min(std::max(m_fScrollOffsetX, 0.0f), fRange);
       m_pHorzScrollBar->SetPos(fPos);
       m_pHorzScrollBar->SetTrackPos(fPos);
       m_pHorzScrollBar->SetPageSize(rtScroll.width);
       m_pHorzScrollBar->SetStepSize(rtScroll.width / 10);
       m_pHorzScrollBar->RemoveStates(FWL_WGTSTATE_Disabled);
       m_pHorzScrollBar->UnlockUpdate();
       m_pHorzScrollBar->Update();
       pRepaint = m_pHorzScrollBar.get();
     } else if ((m_pHorzScrollBar->GetStates() & FWL_WGTSTATE_Disabled) == 0) {
       m_pHorzScrollBar->LockUpdate();
       m_pHorzScrollBar->SetRange(0, -1);
       m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Disabled);
       m_pHorzScrollBar->UnlockUpdate();
       m_pHorzScrollBar->Update();
       pRepaint = m_pHorzScrollBar.get();
     }
   }
 
   if (bShowVert) {
-    CFX_RectF rtScroll;
-    m_pVertScrollBar->GetWidgetRect(rtScroll, false);
+    CFX_RectF rtScroll = m_pVertScrollBar->GetWidgetRect();
     if (rtScroll.height < rtFDE.height) {
       m_pVertScrollBar->LockUpdate();
       FX_FLOAT fStep = m_EdtEngine.GetEditParams()->fLineSpace;
       FX_FLOAT fRange = std::max(rtFDE.height - m_rtEngine.height, fStep);
 
       m_pVertScrollBar->SetRange(0.0f, fRange);
       FX_FLOAT fPos = std::min(std::max(m_fScrollOffsetY, 0.0f), fRange);
       m_pVertScrollBar->SetPos(fPos);
       m_pVertScrollBar->SetTrackPos(fPos);
       m_pVertScrollBar->SetPageSize(rtScroll.height);
@@ skipping 228 matching lines @@
       m_pCaret->SetWidgetRect(*pRect);
     Repaint(&m_rtEngine);
     return;
   }
 
   CFWL_Widget* pOuter = this;
   pRect->Offset(m_pProperties->m_rtWidget.left, m_pProperties->m_rtWidget.top);
   while (pOuter->GetOuter()) {
     pOuter = pOuter->GetOuter();
 
-    CFX_RectF rtOuter;
-    pOuter->GetWidgetRect(rtOuter, false);
+    CFX_RectF rtOuter = pOuter->GetWidgetRect();
     pRect->Offset(rtOuter.left, rtOuter.top);
   }
 
   CXFA_FFWidget* pXFAWidget =
       static_cast<CXFA_FFWidget*>(pOuter->GetLayoutItem());
   if (!pXFAWidget)
     return;
 
   IXFA_DocEnvironment* pDocEnvironment =
       pXFAWidget->GetDoc()->GetDocEnvironment();
@@ skipping 444 matching lines @@
       return false;
   }
   if (iCurPos == fPos)
     return true;
 
   pScrollBar->SetPos(fPos);
   pScrollBar->SetTrackPos(fPos);
   UpdateOffset(pScrollBar, fPos - iCurPos);
   UpdateCaret();
 
-  CFX_RectF rect;
-  GetWidgetRect(rect, false);
+  CFX_RectF rect = GetWidgetRect();
   CFX_RectF rtInvalidate;
   rtInvalidate.Set(0, 0, rect.width + 2, rect.height + 2);
   Repaint(&rtInvalidate);
   return true;
 }