Cleanup FWL default values part II.

xfa/fwl/core/cfwl_form.cpp

Index: xfa/fwl/core/cfwl_form.cpp
diff --git a/xfa/fwl/core/cfwl_form.cpp b/xfa/fwl/core/cfwl_form.cpp
index 0547a035ce8c16880b862863b82f33df168c1ea3..e9d788b5d05ba162ba87ab6edf876133ad5588aa 100644
--- a/xfa/fwl/core/cfwl_form.cpp
+++ b/xfa/fwl/core/cfwl_form.cpp
@@ -385,7 +385,7 @@ int32_t CFWL_Form::GetSysBtnIndex(CFWL_SysBtn* 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);
   }
@@ -549,7 +549,7 @@ void CFWL_Form::OnLButtonUp(CFWL_MsgMouse* pMsg) {
     if (m_bMaximized) {
       SetWidgetRect(m_rtRestore);
       Update();
-      Repaint();
+      Repaint(nullptr);
     } else {
       SetWorkAreaRect();
       Update();