Cleanup FWL default values part II.

xfa/fwl/core/cfwl_form.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_form.h"
 
 #include <utility>
 
@@ skipping 367 matching lines @@
   if (m_pMaxBox)
     arrBtn.Add(m_pMaxBox);
   if (m_pCloseBox)
     arrBtn.Add(m_pCloseBox);
   return arrBtn.Find(pBtn);
 }
 
 void CFWL_Form::GetEdgeRect(CFX_RectF& rtEdge) {
   rtEdge = m_rtRelative;
   if (m_pProperties->m_dwStyles & FWL_WGTSTYLE_Border) {
-    FX_FLOAT fCX = GetBorderSize();
+    FX_FLOAT fCX = GetBorderSize(true);
     FX_FLOAT fCY = GetBorderSize(false);
     rtEdge.Deflate(fCX, fCY, fCX, fCY);
   }
 }
 
 void CFWL_Form::SetWorkAreaRect() {
   m_rtRestore = m_pProperties->m_rtWidget;
   CFWL_WidgetMgr* pWidgetMgr = GetOwnerApp()->GetWidgetMgr();
   if (!pWidgetMgr)
     return;
@@ skipping 143 matching lines @@
   CFWL_SysBtn* pPointBtn = GetSysBtnAtPoint(pMsg->m_fx, pMsg->m_fy);
   CFWL_SysBtn* pPressedBtn = GetSysBtnByIndex(m_iCaptureBtn);
   if (!pPressedBtn || pPointBtn != pPressedBtn)
     return;
   if (pPressedBtn == GetSysBtnByState(FWL_SYSBUTTONSTATE_Pressed))
     pPressedBtn->SetNormal();
   if (pPressedBtn == m_pMaxBox) {
     if (m_bMaximized) {
       SetWidgetRect(m_rtRestore);
       Update();
-      Repaint();
+      Repaint(nullptr);
     } else {
       SetWorkAreaRect();
       Update();
     }
     m_bMaximized = !m_bMaximized;
   } else if (pPressedBtn != m_pMinBox) {
     CFWL_Event eClose(CFWL_EventType::Close);
     eClose.m_pSrcTarget = this;
     DispatchEvent(&eClose);
   }
@@ skipping 67 matching lines @@
       HitTest(pMsg->m_fx, pMsg->m_fy) == FWL_WidgetHit::Titlebar) {
     if (m_bMaximized)
       SetWidgetRect(m_rtRestore);
     else
       SetWorkAreaRect();
 
     Update();
     m_bMaximized = !m_bMaximized;
   }
 }