From ef43608928148bac9b73f6919188efd87feccf95 Mon Sep 17 00:00:00 2001 From: dsinclair Date: Wed, 4 May 2016 13:52:07 -0700 Subject: Convert some theme defines to values. This Cl updates several of the theme defines to be constant values instead of defines. Some of the items were re-ordered so the calculations would work correctly. Review-Url: https://codereview.chromium.org/1945183004 --- xfa/fwl/theme/cfwl_utils.h | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'xfa/fwl/theme/cfwl_utils.h') diff --git a/xfa/fwl/theme/cfwl_utils.h b/xfa/fwl/theme/cfwl_utils.h index 701b647174..cdd768a878 100644 --- a/xfa/fwl/theme/cfwl_utils.h +++ b/xfa/fwl/theme/cfwl_utils.h @@ -29,22 +29,13 @@ enum FWLTHEME_DIRECTION { FWLTHEME_DIRECTION_Right }; -#define FWLTHEME_BEZIER FX_BEZIER -#define FWLTHEME_PI FX_PI #define FWLTHEME_COLOR_EDGERB1 (ArgbEncode(255, 241, 239, 226)) #define FWLTHEME_COLOR_Background (ArgbEncode(255, 236, 233, 216)) #define FWLTHEME_COLOR_BKSelected (ArgbEncode(255, 153, 193, 218)) #define FWLTHEME_COLOR_Green_BKSelected (ArgbEncode(255, 147, 160, 112)) -#define FWLTHEME_CAPACITY_EdgeFlat 2.0f -#define FWLTHEME_CAPACITY_EdgeRaised 2.0f -#define FWLTHEME_CAPACITY_EdgeSunken 2.0f + #define FWLTHEME_CAPACITY_FontSize 12.0f -#define FWLTHEME_CAPACITY_LineHeight 12.0f #define FWLTHEME_CAPACITY_TextColor (ArgbEncode(255, 0, 0, 0)) -#define FWLTHEME_CAPACITY_TextSelColor (ArgbEncode(255, 153, 193, 218)) #define FWLTHEME_CAPACITY_TextDisColor (ArgbEncode(255, 172, 168, 153)) -#define FWLTHEME_CAPACITY_ScrollBarWidth 17.0f -#define FWLTHEME_CAPACITY_CXBorder 1.0f -#define FWLTHEME_CAPACITY_CYBorder 1.0f #endif // XFA_FWL_THEME_CFWL_UTILS_H_ -- cgit v1.2.3