summaryrefslogtreecommitdiff
path: root/xfa/fwl/theme
diff options
context:
space:
mode:
Diffstat (limited to 'xfa/fwl/theme')
-rw-r--r--xfa/fwl/theme/cfwl_carettp.h2
-rw-r--r--xfa/fwl/theme/cfwl_checkboxtp.h6
-rw-r--r--xfa/fwl/theme/cfwl_comboboxtp.h2
-rw-r--r--xfa/fwl/theme/cfwl_datetimepickertp.h2
-rw-r--r--xfa/fwl/theme/cfwl_listboxtp.h2
-rw-r--r--xfa/fwl/theme/cfwl_monthcalendartp.h6
-rw-r--r--xfa/fwl/theme/cfwl_pushbuttontp.h7
-rw-r--r--xfa/fwl/theme/cfwl_scrollbartp.h6
8 files changed, 12 insertions, 21 deletions
diff --git a/xfa/fwl/theme/cfwl_carettp.h b/xfa/fwl/theme/cfwl_carettp.h
index a71afc935f..2fe01bed1a 100644
--- a/xfa/fwl/theme/cfwl_carettp.h
+++ b/xfa/fwl/theme/cfwl_carettp.h
@@ -17,7 +17,7 @@ class CFWL_CaretTP final : public CFWL_WidgetTP {
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
void DrawCaretBK(CXFA_Graphics* pGraphics,
uint32_t dwStates,
const CFX_RectF* pRect,
diff --git a/xfa/fwl/theme/cfwl_checkboxtp.h b/xfa/fwl/theme/cfwl_checkboxtp.h
index fa06c7ec0e..506f78413a 100644
--- a/xfa/fwl/theme/cfwl_checkboxtp.h
+++ b/xfa/fwl/theme/cfwl_checkboxtp.h
@@ -23,7 +23,7 @@ class CFWL_CheckBoxTP final : public CFWL_WidgetTP {
void DrawText(CFWL_ThemeText* pParams) override;
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
struct CKBThemeData {
FX_ARGB clrSignBorderNormal;
FX_ARGB clrSignBorderDisable;
@@ -66,12 +66,10 @@ class CFWL_CheckBoxTP final : public CFWL_WidgetTP {
CFX_Matrix* pMatrix);
void InitCheckPath(float fCheckLen);
+ void SetThemeData();
std::unique_ptr<CKBThemeData> m_pThemeData;
std::unique_ptr<CXFA_GEPath> m_pCheckPath;
-
- private:
- void SetThemeData();
};
#endif // XFA_FWL_THEME_CFWL_CHECKBOXTP_H_
diff --git a/xfa/fwl/theme/cfwl_comboboxtp.h b/xfa/fwl/theme/cfwl_comboboxtp.h
index dd8311c8a1..1456143e43 100644
--- a/xfa/fwl/theme/cfwl_comboboxtp.h
+++ b/xfa/fwl/theme/cfwl_comboboxtp.h
@@ -17,7 +17,7 @@ class CFWL_ComboBoxTP final : public CFWL_WidgetTP {
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
void DrawDropDownButton(CFWL_ThemeBackground* pParams,
uint32_t dwStates,
CFX_Matrix* pMatrix);
diff --git a/xfa/fwl/theme/cfwl_datetimepickertp.h b/xfa/fwl/theme/cfwl_datetimepickertp.h
index 5a548511cf..e7a7239e8d 100644
--- a/xfa/fwl/theme/cfwl_datetimepickertp.h
+++ b/xfa/fwl/theme/cfwl_datetimepickertp.h
@@ -17,7 +17,7 @@ class CFWL_DateTimePickerTP final : public CFWL_WidgetTP {
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
void DrawDropDownButton(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix);
};
diff --git a/xfa/fwl/theme/cfwl_listboxtp.h b/xfa/fwl/theme/cfwl_listboxtp.h
index 95ce01c441..e87ac6f062 100644
--- a/xfa/fwl/theme/cfwl_listboxtp.h
+++ b/xfa/fwl/theme/cfwl_listboxtp.h
@@ -17,7 +17,7 @@ class CFWL_ListBoxTP final : public CFWL_WidgetTP {
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
void DrawListBoxItem(CXFA_Graphics* pGraphics,
uint32_t dwStates,
const CFX_RectF* prtItem,
diff --git a/xfa/fwl/theme/cfwl_monthcalendartp.h b/xfa/fwl/theme/cfwl_monthcalendartp.h
index 95e2a190b7..4dd08b49c3 100644
--- a/xfa/fwl/theme/cfwl_monthcalendartp.h
+++ b/xfa/fwl/theme/cfwl_monthcalendartp.h
@@ -22,7 +22,7 @@ class CFWL_MonthCalendarTP final : public CFWL_WidgetTP {
void DrawBackground(CFWL_ThemeBackground* pParams) override;
void DrawText(CFWL_ThemeText* pParams) override;
- protected:
+ private:
struct MCThemeData {
FX_ARGB clrCaption;
FX_ARGB clrSeperator;
@@ -43,12 +43,10 @@ class CFWL_MonthCalendarTP final : public CFWL_WidgetTP {
void DrawHSeperator(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix);
void DrawWeekNumSep(CFWL_ThemeBackground* pParams, CFX_Matrix* pMatrix);
FWLTHEME_STATE GetState(uint32_t dwFWLStates);
+ void SetThemeData();
std::unique_ptr<MCThemeData> m_pThemeData;
WideString wsResource;
-
- private:
- void SetThemeData();
};
#endif // XFA_FWL_THEME_CFWL_MONTHCALENDARTP_H_
diff --git a/xfa/fwl/theme/cfwl_pushbuttontp.h b/xfa/fwl/theme/cfwl_pushbuttontp.h
index 2e1782a1b5..6b49ba6479 100644
--- a/xfa/fwl/theme/cfwl_pushbuttontp.h
+++ b/xfa/fwl/theme/cfwl_pushbuttontp.h
@@ -19,7 +19,7 @@ class CFWL_PushButtonTP final : public CFWL_WidgetTP {
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
struct PBThemeData {
FX_ARGB clrBorder[5];
FX_ARGB clrStart[5];
@@ -34,13 +34,10 @@ class CFWL_PushButtonTP final : public CFWL_WidgetTP {
void SetBackgroudColor(uint32_t* pData);
void SetCaptionColor(uint32_t* pData);
void SetCornerColor(uint32_t* pData);
-
int32_t GetColorID(uint32_t dwStates) const;
+ void SetThemeData();
std::unique_ptr<PBThemeData> m_pThemeData;
-
- private:
- void SetThemeData();
};
#endif // XFA_FWL_THEME_CFWL_PUSHBUTTONTP_H_
diff --git a/xfa/fwl/theme/cfwl_scrollbartp.h b/xfa/fwl/theme/cfwl_scrollbartp.h
index 53cbb38d83..2a202e1b1e 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.h
+++ b/xfa/fwl/theme/cfwl_scrollbartp.h
@@ -19,7 +19,7 @@ class CFWL_ScrollBarTP final : public CFWL_WidgetTP {
// CFWL_WidgetTP
void DrawBackground(CFWL_ThemeBackground* pParams) override;
- protected:
+ private:
struct SBThemeData {
FX_ARGB clrTrackBKStart;
FX_ARGB clrTrackBKEnd;
@@ -51,11 +51,9 @@ class CFWL_ScrollBarTP final : public CFWL_WidgetTP {
bool bVert,
FWLTHEME_STATE eState,
CFX_Matrix* pMatrix);
+ void SetThemeData();
std::unique_ptr<SBThemeData> m_pThemeData;
-
- private:
- void SetThemeData();
};
#endif // XFA_FWL_THEME_CFWL_SCROLLBARTP_H_