Correctly implement GetPartState() function

xfa/fwl/core/fwl_formimp.h

Index: xfa/fwl/core/fwl_formimp.h
diff --git a/xfa/fwl/core/fwl_formimp.h b/xfa/fwl/core/fwl_formimp.h
index 9d2d394d0369733e07ff67faf7fdb9747459f830..181324a14c9b80603bef803dbc18257d58928c82 100644
--- a/xfa/fwl/core/fwl_formimp.h
+++ b/xfa/fwl/core/fwl_formimp.h
@@ -48,7 +48,13 @@ class CFWL_SysBtn {
               : m_dwState &= ~FWL_SYSBUTTONSTATE_Disabled;
   }
   int32_t GetPartState() {

[dsinclair, 2016/05/24 00:28:53]

Can we update the return to be CFWL_PartState while we're at it?

[Wei Li, 2016/05/24 00:43:22]

I am not sure about this. From the way how PartState is defined and used, looks
like it is not an enum, but a set of these enums. 

[dsinclair, 2016/05/24 02:20:36]

PartState shouldn't be a set of enums anymore unless I missed some. This one
should have been consolidated into the enum from a set of #defines.  I guess the
question is, how is the return value here used? If it get's OR'd we should leave
it as an uint32_t.

-    return (IsDisabled() ? CFWL_PartState_Disabled : (m_dwState + 1));
+    if (IsDisabled())
+      return CFWL_PartState_Disabled;
+    if (m_dwState & FWL_SYSBUTTONSTATE_Pressed)
+      return CFWL_PartState_Pressed;
+    if (m_dwState & FWL_SYSBUTTONSTATE_Hover)
+      return FWL_SYSBUTTONSTATE_Hover;

[dsinclair, 2016/05/24 00:28:53]

CFWL_PartState_Hovered?

[Wei Li, 2016/05/24 00:43:22]

oops, fixed.

+    return CFWL_PartState_Normal;
   }
 
   CFX_RectF m_rtBtn;