summaryrefslogtreecommitdiff
path: root/xfa/fwl/theme
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl/theme')
-rw-r--r--xfa/fwl/theme/cfwl_arrowdata.cpp2
-rw-r--r--xfa/fwl/theme/cfwl_arrowdata.h2
-rw-r--r--xfa/fwl/theme/cfwl_monthcalendartp.cpp8
-rw-r--r--xfa/fwl/theme/cfwl_scrollbartp.cpp18
-rw-r--r--xfa/fwl/theme/cfwl_scrollbartp.h10
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.cpp20
-rw-r--r--xfa/fwl/theme/cfwl_widgettp.h10
7 files changed, 35 insertions, 35 deletions
diff --git a/xfa/fwl/theme/cfwl_arrowdata.cpp b/xfa/fwl/theme/cfwl_arrowdata.cpp
index 16580f7f9c..51af713cbb 100644
--- a/xfa/fwl/theme/cfwl_arrowdata.cpp
+++ b/xfa/fwl/theme/cfwl_arrowdata.cpp
@@ -20,7 +20,7 @@ CFWL_ArrowData* CFWL_ArrowData::GetInstance() {
return g_pInstance;
}
-FX_BOOL CFWL_ArrowData::HasInstance() {
+bool CFWL_ArrowData::HasInstance() {
return !!g_pInstance;
}
diff --git a/xfa/fwl/theme/cfwl_arrowdata.h b/xfa/fwl/theme/cfwl_arrowdata.h
index efec1b50b1..1bcdac15fb 100644
--- a/xfa/fwl/theme/cfwl_arrowdata.h
+++ b/xfa/fwl/theme/cfwl_arrowdata.h
@@ -22,7 +22,7 @@ class CFWL_ArrowData {
};
static CFWL_ArrowData* GetInstance();
- static FX_BOOL HasInstance();
+ static bool HasInstance();
static void DestroyInstance();
void SetColorData(uint32_t dwID);
diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.cpp b/xfa/fwl/theme/cfwl_monthcalendartp.cpp
index b554483dcd..b50d492ade 100644
--- a/xfa/fwl/theme/cfwl_monthcalendartp.cpp
+++ b/xfa/fwl/theme/cfwl_monthcalendartp.cpp
@@ -144,8 +144,8 @@ void CFWL_MonthCalendarTP::DrawText(CFWL_ThemeText* pParams) {
void* CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart* pThemePart,
CFWL_WidgetCapacity dwCapacity) {
- FX_BOOL bDefPro = FALSE;
- FX_BOOL bDwordVal = FALSE;
+ bool bDefPro = false;
+ bool bDwordVal = false;
switch (dwCapacity) {
case CFWL_WidgetCapacity::HeaderWidth: {
m_fValue = kHeaderWidth;
@@ -164,7 +164,7 @@ void* CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart* pThemePart,
break;
}
case CFWL_WidgetCapacity::HeaderBtnHMargin: {
- bDwordVal = TRUE;
+ bDwordVal = true;
m_dwValue = kButtonHorizontalMargin;
break;
}
@@ -341,7 +341,7 @@ void* CFWL_MonthCalendarTP::GetCapacity(CFWL_ThemePart* pThemePart,
return &wsResource;
}
default:
- bDefPro = TRUE;
+ bDefPro = true;
break;
}
if (!bDefPro) {
diff --git a/xfa/fwl/theme/cfwl_scrollbartp.cpp b/xfa/fwl/theme/cfwl_scrollbartp.cpp
index faad11f2c3..5a1ae5cfb6 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.cpp
+++ b/xfa/fwl/theme/cfwl_scrollbartp.cpp
@@ -75,15 +75,15 @@ void CFWL_ScrollBarTP::DrawBackground(CFWL_ThemeBackground* pParams) {
break;
}
case CFWL_Part::Thumb: {
- DrawThumbBtn(pGraphics, pRect, bVert, eState, TRUE, &pParams->m_matrix);
+ DrawThumbBtn(pGraphics, pRect, bVert, eState, true, &pParams->m_matrix);
break;
}
case CFWL_Part::LowerTrack: {
- DrawTrack(pGraphics, pRect, bVert, eState, TRUE, &pParams->m_matrix);
+ DrawTrack(pGraphics, pRect, bVert, eState, true, &pParams->m_matrix);
break;
}
case CFWL_Part::UpperTrack: {
- DrawTrack(pGraphics, pRect, bVert, eState, FALSE, &pParams->m_matrix);
+ DrawTrack(pGraphics, pRect, bVert, eState, false, &pParams->m_matrix);
break;
}
default:
@@ -93,9 +93,9 @@ void CFWL_ScrollBarTP::DrawBackground(CFWL_ThemeBackground* pParams) {
void CFWL_ScrollBarTP::DrawThumbBtn(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
- FX_BOOL bVert,
+ bool bVert,
FWLTHEME_STATE eState,
- FX_BOOL bPawButton,
+ bool bPawButton,
CFX_Matrix* pMatrix) {
if (eState < FWLTHEME_STATE_Normal || eState > FWLTHEME_STATE_Disable)
return;
@@ -140,7 +140,7 @@ void CFWL_ScrollBarTP::DrawThumbBtn(CFX_Graphics* pGraphics,
void CFWL_ScrollBarTP::DrawPaw(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
- FX_BOOL bVert,
+ bool bVert,
FWLTHEME_STATE eState,
CFX_Matrix* pMatrix) {
CFX_Path path;
@@ -216,9 +216,9 @@ void CFWL_ScrollBarTP::DrawPaw(CFX_Graphics* pGraphics,
void CFWL_ScrollBarTP::DrawTrack(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
- FX_BOOL bVert,
+ bool bVert,
FWLTHEME_STATE eState,
- FX_BOOL bLowerTrack,
+ bool bLowerTrack,
CFX_Matrix* pMatrix) {
if (eState < FWLTHEME_STATE_Normal || eState > FWLTHEME_STATE_Disable)
return;
@@ -257,7 +257,7 @@ void CFWL_ScrollBarTP::DrawMaxMinBtn(CFX_Graphics* pGraphics,
CFX_Matrix* pMatrix) {
DrawTrack(pGraphics, pRect,
eDict == FWLTHEME_DIRECTION_Up || eDict == FWLTHEME_DIRECTION_Down,
- eState, TRUE, pMatrix);
+ eState, true, pMatrix);
CFX_RectF rtArrowBtn(*pRect);
rtArrowBtn.Deflate(1, 1, 1, 1);
DrawArrowBtn(pGraphics, &rtArrowBtn, eDict, eState, pMatrix);
diff --git a/xfa/fwl/theme/cfwl_scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h
index 6caf8f4917..128eeb4d76 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.h
+++ b/xfa/fwl/theme/cfwl_scrollbartp.h
@@ -35,15 +35,15 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP {
void DrawThumbBtn(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
- FX_BOOL bVert,
+ bool bVert,
FWLTHEME_STATE eState,
- FX_BOOL bPawButton = TRUE,
+ bool bPawButton = true,
CFX_Matrix* pMatrix = nullptr);
void DrawTrack(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
- FX_BOOL bVert,
+ bool bVert,
FWLTHEME_STATE eState,
- FX_BOOL bLowerTrack,
+ bool bLowerTrack,
CFX_Matrix* pMatrix = nullptr);
void DrawMaxMinBtn(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
@@ -52,7 +52,7 @@ class CFWL_ScrollBarTP : public CFWL_WidgetTP {
CFX_Matrix* pMatrix = nullptr);
void DrawPaw(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
- FX_BOOL bVert,
+ bool bVert,
FWLTHEME_STATE eState,
CFX_Matrix* pMatrix = nullptr);
void SetThemeData(uint32_t dwID);
diff --git a/xfa/fwl/theme/cfwl_widgettp.cpp b/xfa/fwl/theme/cfwl_widgettp.cpp
index f313511164..bbcbabbb54 100644
--- a/xfa/fwl/theme/cfwl_widgettp.cpp
+++ b/xfa/fwl/theme/cfwl_widgettp.cpp
@@ -37,7 +37,7 @@ const float kCYBorder = 1.0f;
} // namespace
bool CFWL_WidgetTP::IsValidWidget(IFWL_Widget* pWidget) {
- return FALSE;
+ return false;
}
uint32_t CFWL_WidgetTP::GetThemeID(IFWL_Widget* pWidget) {
@@ -418,7 +418,7 @@ void CFWL_WidgetTP::DrawAxialShading(CFX_Graphics* pGraphics,
CFX_PointF begPoint(fx1, fy1);
CFX_PointF endPoint(fx2, fy2);
- CFX_Shading shading(begPoint, endPoint, FALSE, FALSE, beginColor, endColor);
+ CFX_Shading shading(begPoint, endPoint, false, false, beginColor, endColor);
pGraphics->SaveGraphState();
CFX_Color color1(&shading);
pGraphics->SetFillColor(&color1);
@@ -496,7 +496,7 @@ void CFWL_WidgetTP::DrawArrow(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
FWLTHEME_DIRECTION eDict,
FX_ARGB argbFill,
- FX_BOOL bPressed,
+ bool bPressed,
CFX_Matrix* pMatrix) {
CFX_RectF rtArrow(*pRect);
CFX_Path path;
@@ -552,7 +552,7 @@ void CFWL_WidgetTP::DrawArrow(CFX_Graphics* pGraphics,
FWLTHEME_DIRECTION eDict,
FX_ARGB argSign,
CFX_Matrix* pMatrix) {
- FX_BOOL bVert =
+ bool bVert =
(eDict == FWLTHEME_DIRECTION_Up || eDict == FWLTHEME_DIRECTION_Down);
FX_FLOAT fLeft =
(FX_FLOAT)(((pRect->width - (bVert ? 9 : 6)) / 2 + pRect->left) + 0.5);
@@ -649,16 +649,16 @@ CFWL_FontData::CFWL_FontData() : m_dwStyles(0), m_dwCodePage(0) {}
CFWL_FontData::~CFWL_FontData() {}
-FX_BOOL CFWL_FontData::Equal(const CFX_WideStringC& wsFontFamily,
- uint32_t dwFontStyles,
- uint16_t wCodePage) {
+bool CFWL_FontData::Equal(const CFX_WideStringC& wsFontFamily,
+ uint32_t dwFontStyles,
+ uint16_t wCodePage) {
return m_wsFamily == wsFontFamily && m_dwStyles == dwFontStyles &&
m_dwCodePage == wCodePage;
}
-FX_BOOL CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily,
- uint32_t dwFontStyles,
- uint16_t dwCodePage) {
+bool CFWL_FontData::LoadFont(const CFX_WideStringC& wsFontFamily,
+ uint32_t dwFontStyles,
+ uint16_t dwCodePage) {
m_wsFamily = wsFontFamily;
m_dwStyles = dwFontStyles;
m_dwCodePage = dwCodePage;
diff --git a/xfa/fwl/theme/cfwl_widgettp.h b/xfa/fwl/theme/cfwl_widgettp.h
index 02f3981077..73625d05d8 100644
--- a/xfa/fwl/theme/cfwl_widgettp.h
+++ b/xfa/fwl/theme/cfwl_widgettp.h
@@ -196,7 +196,7 @@ class CFWL_WidgetTP {
const CFX_RectF* pRect,
FWLTHEME_DIRECTION eDict,
FX_ARGB argbFill,
- FX_BOOL bPressed,
+ bool bPressed,
CFX_Matrix* pMatrix = nullptr);
void DrawArrow(CFX_Graphics* pGraphics,
const CFX_RectF* pRect,
@@ -230,12 +230,12 @@ class CFWL_FontData {
CFWL_FontData();
virtual ~CFWL_FontData();
- FX_BOOL Equal(const CFX_WideStringC& wsFontFamily,
+ bool Equal(const CFX_WideStringC& wsFontFamily,
+ uint32_t dwFontStyles,
+ uint16_t wCodePage);
+ bool LoadFont(const CFX_WideStringC& wsFontFamily,
uint32_t dwFontStyles,
uint16_t wCodePage);
- FX_BOOL LoadFont(const CFX_WideStringC& wsFontFamily,
- uint32_t dwFontStyles,
- uint16_t wCodePage);
CFGAS_GEFont* GetFont() const { return m_pFont.get(); }
protected:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 04:51:20 +0000