Subtract instead of adding the negation.

xfa/fwl/basewidget/fwl_editimp.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/basewidget/fwl_editimp.h"
 
 #include <algorithm>
 #include <vector>
@@ skipping 11 matching lines @@
 #include "xfa/fwl/core/cfwl_themepart.h"
 #include "xfa/fwl/core/fwl_appimp.h"
 #include "xfa/fwl/core/fwl_noteimp.h"
 #include "xfa/fwl/core/fwl_widgetimp.h"
 #include "xfa/fwl/core/fwl_widgetmgrimp.h"
 #include "xfa/fwl/core/ifwl_themeprovider.h"
 #include "xfa/fxfa/include/xfa_ffdoc.h"
 #include "xfa/fxfa/include/xfa_ffwidget.h"
 #include "xfa/fxgraphics/cfx_path.h"
 
+namespace {
+
+bool FX_EDIT_ISLATINWORD(FX_WCHAR c) {
+  return c == 0x2D || (c <= 0x005A && c >= 0x0041) ||
+         (c <= 0x007A && c >= 0x0061) || (c <= 0x02AF && c >= 0x00C0) ||
+         c == 0x0027;
+}
+
+void AddSquigglyPath(CFX_Path* pPathData,
+                     FX_FLOAT fStartX,
+                     FX_FLOAT fEndX,
+                     FX_FLOAT fY,
+                     FX_FLOAT fStep) {
+  pPathData->MoveTo(fStartX, fY);
+  int i = 1;
+  for (FX_FLOAT fx = fStartX + fStep; fx < fEndX; fx += fStep, ++i) {
+    pPathData->LineTo(fx, fY + (i & 1) * fStep);
+  }
+}
+
+}  // namespace
+
 // static
 IFWL_Edit* IFWL_Edit::Create(const CFWL_WidgetImpProperties& properties,
                              IFWL_Widget* pOuter) {
   IFWL_Edit* pEdit = new IFWL_Edit;
   CFWL_EditImp* pEditImpl = new CFWL_EditImp(properties, pOuter);
   pEdit->SetImpl(pEditImpl);
   pEditImpl->SetInterface(pEdit);
   return pEdit;
 }
 // static
@@ skipping 249 matching lines @@
   Layout();
   if (m_rtClient.IsEmpty()) {
     return FWL_ERR_Indefinite;
   }
   UpdateEditEngine();
   UpdateVAlignment();
   UpdateScroll();
   InitCaret();
   return FWL_ERR_Succeeded;
 }
+
 uint32_t CFWL_EditImp::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);
-      if (rect.Contains(fx, fy)) {
+      if (rect.Contains(fx, fy))
         return FWL_WGTHITTEST_VScrollBar;
-      }
     }
     if (IsShowScrollBar(FALSE)) {
       CFX_RectF rect;
       m_pHorzScrollBar->GetWidgetRect(rect);
-      if (rect.Contains(fx, fy)) {
+      if (rect.Contains(fx, fy))
         return FWL_WGTHITTEST_HScrollBar;
-      }
     }
   }
-  if (m_rtClient.Contains(fx, fy)) {
+  if (m_rtClient.Contains(fx, fy))
     return FWL_WGTHITTEST_Edit;
-  }
   return FWL_WGTHITTEST_Unknown;
 }
-#define FX_EDIT_ISLATINWORD(u)                                     \
-  (u == 0x2D || (u <= 0x005A && u >= 0x0041) ||                    \
-   (u <= 0x007A && u >= 0x0061) || (u <= 0x02AF && u >= 0x00C0) || \
-   u == 0x0027)
-static void AddSquigglyPath(CFX_Path& PathData,
-                            FX_FLOAT fStartX,
-                            FX_FLOAT fEndX,
-                            FX_FLOAT fY,
-                            FX_FLOAT fStep) {
-  PathData.MoveTo(fStartX, fY);
-  FX_FLOAT fx;
-  int32_t i;
-  for (i = 1, fx = fStartX + fStep; fx < fEndX; fx += fStep, i++) {
-    PathData.LineTo(fx, fY + (i & 1) * fStep);
-  }
-}
+
 void CFWL_EditImp::AddSpellCheckObj(CFX_Path& PathData,
                                     int32_t nStart,
                                     int32_t nCount,
                                     FX_FLOAT fOffSetX,
                                     FX_FLOAT fOffSetY) {
   FX_FLOAT fStartX = 0.0f;
   FX_FLOAT fEndX = 0.0f;
   FX_FLOAT fY = 0.0f;
   FX_FLOAT fStep = 0.0f;
   IFDE_TxtEdtPage* pPage = m_pEdtEngine->GetPage(0);
   CFX_RectFArray rectArray;
   CFX_RectF rectText;
   const FDE_TXTEDTPARAMS* txtEdtParams = m_pEdtEngine->GetEditParams();
   FX_FLOAT fAsent = (FX_FLOAT)txtEdtParams->pFont->GetAscent() *
                     txtEdtParams->fFontSize / 1000;
   pPage->CalcRangeRectArray(nStart, nCount, rectArray);
   for (int i = 0; i < rectArray.GetSize(); i++) {
     rectText = rectArray.GetAt(i);
     fY = rectText.top + fAsent + fOffSetY;
     fStep = txtEdtParams->fFontSize / 16.0f;
     fStartX = rectText.left + fOffSetX;
     fEndX = fStartX + rectText.Width();
-    AddSquigglyPath(PathData, fStartX, fEndX, fY, fStep);
+    AddSquigglyPath(&PathData, fStartX, fEndX, fY, fStep);
   }
 }
 int32_t CFWL_EditImp::GetWordAtPoint(CFX_PointF pointf, int32_t& nCount) {
   return 0;
 }
 FX_BOOL CFWL_EditImp::GetSuggestWords(CFX_PointF pointf,
                                       std::vector<CFX_ByteString>& sSuggest) {
   int32_t nWordCount = 0;
   int32_t nWordStart = GetWordAtPoint(pointf, nWordCount);
   if (nWordCount < 1) {
@@ skipping 836 matching lines @@
   CFX_RectF rtCaret;
   m_pEdtEngine->GetCaretRect(rtCaret);
   FX_FLOAT fOffSetX = m_rtEngine.left - m_fScrollOffsetX;
   FX_FLOAT fOffSetY = m_rtEngine.top - m_fScrollOffsetY + m_fVAlignOffset;
   rtCaret.Offset(fOffSetX, fOffSetY);
   const CFX_RectF& rtEidt = m_rtEngine;
   if (rtEidt.Contains(rtCaret)) {
     IFDE_TxtEdtPage* pPage = m_pEdtEngine->GetPage(0);
     if (!pPage)
       return FALSE;
+
     CFX_RectF rtFDE = pPage->GetContentsBox();
     rtFDE.Offset(fOffSetX, fOffSetY);
     if (rtFDE.right() < rtEidt.right() && m_fScrollOffsetX > 0) {
       m_fScrollOffsetX += rtFDE.right() - rtEidt.right();
-      if (m_fScrollOffsetX < 0) {
-        m_fScrollOffsetX = 0;
-      }
+      m_fScrollOffsetX = std::max(m_fScrollOffsetX, 0.0f);
     }
     if (rtFDE.bottom() < rtEidt.bottom() && m_fScrollOffsetY > 0) {
       m_fScrollOffsetY += rtFDE.bottom() - rtEidt.bottom();
-      if (m_fScrollOffsetY < 0) {
-        m_fScrollOffsetY = 0;
-      }
+      m_fScrollOffsetY = std::max(m_fScrollOffsetY, 0.0f);
     }
     return FALSE;
-  } else {
-    FX_FLOAT offsetX = 0.0;
-    FX_FLOAT offsetY = 0.0;
-    if (rtCaret.left < rtEidt.left) {
-      offsetX = rtCaret.left - rtEidt.left;
-    }
-    if (rtCaret.right() > rtEidt.right()) {
-      offsetX = rtCaret.right() - rtEidt.right();
-    }
-    if (rtCaret.top < rtEidt.top) {
-      offsetY = rtCaret.top - rtEidt.top;
-    }
-    if (rtCaret.bottom() > rtEidt.bottom()) {
-      offsetY = rtCaret.bottom() - rtEidt.bottom();
-    }
-    if (!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_HSelfAdaption)) {
-      m_fScrollOffsetX += offsetX;
-    }
-    if (!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_VSelfAdaption)) {
-      m_fScrollOffsetY += offsetY;
-    }
-    if (m_fFontSize > m_rtEngine.height) {
-      m_fScrollOffsetY = 0;
-    }
-    return TRUE;
   }
+
+  FX_FLOAT offsetX = 0.0;
+  FX_FLOAT offsetY = 0.0;
+  if (rtCaret.left < rtEidt.left)
+    offsetX = rtCaret.left - rtEidt.left;
+  if (rtCaret.right() > rtEidt.right())
+    offsetX = rtCaret.right() - rtEidt.right();
+  if (rtCaret.top < rtEidt.top)
+    offsetY = rtCaret.top - rtEidt.top;
+  if (rtCaret.bottom() > rtEidt.bottom())
+    offsetY = rtCaret.bottom() - rtEidt.bottom();
+  if (!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_HSelfAdaption))
+    m_fScrollOffsetX += offsetX;
+  if (!(m_pProperties->m_dwStyleExes & FWL_STYLEEXT_EDT_VSelfAdaption))
+    m_fScrollOffsetY += offsetY;
+  if (m_fFontSize > m_rtEngine.height)
+    m_fScrollOffsetY = 0;
+  return TRUE;
 }
+
 FX_BOOL CFWL_EditImp::UpdateOffset(IFWL_ScrollBar* pScrollBar,
                                    FX_FLOAT fPosChanged) {
-  if (pScrollBar == m_pHorzScrollBar.get()) {
+  if (pScrollBar == m_pHorzScrollBar.get())
     m_fScrollOffsetX += fPosChanged;
-  } else {
+  else
     m_fScrollOffsetY += fPosChanged;
-  }
   return TRUE;
 }
+
 void CFWL_EditImp::UpdateVAlignment() {
   IFDE_TxtEdtPage* pPage = m_pEdtEngine->GetPage(0);
   if (!pPage)
     return;
   const CFX_RectF& rtFDE = pPage->GetContentsBox();
   FX_FLOAT fOffsetY = 0.0f;
   FX_FLOAT fSpaceAbove = 0.0f;
   FX_FLOAT fSpaceBelow = 0.0f;
   CFX_SizeF* pSpace = static_cast<CFX_SizeF*>(
       GetThemeCapacity(CFWL_WidgetCapacity::SpaceAboveBelow));
@@ skipping 306 matching lines @@
       m_pHorzScrollBar->Update();
     }
     m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Invisible, FALSE);
   } else if (m_pHorzScrollBar) {
     m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Invisible, TRUE);
   }
   if (bShowVertScrollbar || bShowHorzScrollbar) {
     UpdateScroll();
   }
 }
+
 void CFWL_EditImp::DeviceToEngine(CFX_PointF& pt) {
-  pt.x += -m_rtEngine.left + m_fScrollOffsetX;
-  pt.y += -m_rtEngine.top - m_fVAlignOffset + m_fScrollOffsetY;
+  pt.x += m_fScrollOffsetX - m_rtEngine.left;
+  pt.y += m_fScrollOffsetY - m_rtEngine.top - m_fVAlignOffset;
 }
+
 void CFWL_EditImp::InitScrollBar(FX_BOOL bVert) {
   if ((bVert && m_pVertScrollBar) || (!bVert && m_pHorzScrollBar)) {
     return;
   }
   CFWL_WidgetImpProperties prop;
   prop.m_dwStyleExes = bVert ? FWL_STYLEEXT_SCB_Vert : FWL_STYLEEXT_SCB_Horz;
   prop.m_dwStates = FWL_WGTSTATE_Disabled | FWL_WGTSTATE_Invisible;
   prop.m_pParent = m_pInterface;
   prop.m_pThemeProvider = m_pProperties->m_pThemeProvider;
   IFWL_ScrollBar* pScrollBar = IFWL_ScrollBar::Create(prop, m_pInterface);
   pScrollBar->Initialize();
   (bVert ? &m_pVertScrollBar : &m_pHorzScrollBar)->reset(pScrollBar);
 }
 void CFWL_EditImp::InitEngine() {
   if (m_pEdtEngine) {
     return;
   }
   m_pEdtEngine = IFDE_TxtEdtEngine::Create();
 }
 
 FX_BOOL FWL_ShowCaret(IFWL_Widget* pWidget,
                       FX_BOOL bVisible,
                       const CFX_RectF* pRtAnchor) {
-  CXFA_FFWidget* pXFAWidget = (CXFA_FFWidget*)pWidget->GetPrivateData(pWidget);
-  if (!pXFAWidget) {
+  CXFA_FFWidget* pXFAWidget =
+      static_cast<CXFA_FFWidget*>(pWidget->GetPrivateData(pWidget));
+  if (!pXFAWidget)
     return FALSE;
-  }
+
   IXFA_DocProvider* pDocProvider = pXFAWidget->GetDoc()->GetDocProvider();
-  if (!pDocProvider) {
+  if (!pDocProvider)
     return FALSE;
-  }
+
   if (bVisible) {
     CFX_Matrix mt;
     pXFAWidget->GetRotateMatrix(mt);
     CFX_RectF rt(*pRtAnchor);
     mt.TransformRect(rt);
     pDocProvider->DisplayCaret(pXFAWidget, bVisible, &rt);
     return TRUE;
   }
   pDocProvider->DisplayCaret(pXFAWidget, bVisible, pRtAnchor);
   return TRUE;
@@ skipping 531 matching lines @@
     }
     CFX_RectF rect;
     m_pOwner->GetWidgetRect(rect);
     CFX_RectF rtInvalidate;
     rtInvalidate.Set(0, 0, rect.width + 2, rect.height + 2);
     m_pOwner->Repaint(&rtInvalidate);
   }
   return TRUE;
 }
 void CFWL_EditImpDelegate::DoCursor(CFWL_MsgMouse* pMsg) {}