Consistent naming of FWL macros and members.
-- Rename FWL_WGTSTATE_* to FWL_STATE_WGT_* to align with the other
FWL_STATE_*_* constants. Put these into cfwl_widget.h to align with
the other headers defining FWL_STATE_*.
-- Rename FWL_WGTSTYLE_* to FWL_STYLE_WGT_* to align with the other
FWL_STYLE_* constants. Put these into cfwl_widget.h to align with
the other headers defining FWL_STYLE_*.
-- Comment this naming convention in CFWL_Widget::Properties.
-- Make style extension methods and members all named StyleExts.
-- Remove includes of fwl_widgetdef.h that are no longer needed.
Change-Id: I876dd39bd025ef7294e54851a28e378428440eb3
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/83190
Reviewed-by: Lei Zhang <thestig@chromium.org>
Commit-Queue: Tom Sepez <tsepez@chromium.org>
diff --git a/xfa/fwl/cfwl_barcode.cpp b/xfa/fwl/cfwl_barcode.cpp
index 09065e9..65d7f18 100644
--- a/xfa/fwl/cfwl_barcode.cpp
+++ b/xfa/fwl/cfwl_barcode.cpp
@@ -35,7 +35,7 @@
if (!pGraphics)
return;
- if ((m_Properties.m_dwStates & FWL_WGTSTATE_Focused) == 0) {
+ if ((m_Properties.m_dwStates & FWL_STATE_WGT_Focused) == 0) {
GenerateBarcodeImageCache();
if (!m_pBarcodeEngine || m_eStatus != Status::kEncodeSuccess)
return;
diff --git a/xfa/fwl/cfwl_caret.cpp b/xfa/fwl/cfwl_caret.cpp
index 9843776..417901d 100644
--- a/xfa/fwl/cfwl_caret.cpp
+++ b/xfa/fwl/cfwl_caret.cpp
@@ -11,7 +11,6 @@
#include "xfa/fwl/cfwl_app.h"
#include "xfa/fwl/cfwl_notedriver.h"
#include "xfa/fwl/cfwl_themebackground.h"
-#include "xfa/fwl/fwl_widgetdef.h"
#include "xfa/fwl/ifwl_themeprovider.h"
namespace {
@@ -48,13 +47,13 @@
void CFWL_Caret::ShowCaret() {
m_pTimer = std::make_unique<CFX_Timer>(GetFWLApp()->GetTimerHandler(), this,
kBlinkPeriodMs);
- RemoveStates(FWL_WGTSTATE_Invisible);
+ RemoveStates(FWL_STATE_WGT_Invisible);
SetStates(kStateHighlight);
}
void CFWL_Caret::HideCaret() {
m_pTimer.reset();
- SetStates(FWL_WGTSTATE_Invisible);
+ SetStates(FWL_STATE_WGT_Invisible);
}
void CFWL_Caret::DrawCaretBK(CFGAS_GEGraphics* pGraphics,
diff --git a/xfa/fwl/cfwl_checkbox.cpp b/xfa/fwl/cfwl_checkbox.cpp
index 13a388e..f482165 100644
--- a/xfa/fwl/cfwl_checkbox.cpp
+++ b/xfa/fwl/cfwl_checkbox.cpp
@@ -64,7 +64,7 @@
param.m_dwStates = dwStates;
param.m_matrix = matrix;
param.m_PartRect = m_ClientRect;
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Focused)
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Focused)
param.m_pRtData = &m_FocusRect;
IFWL_ThemeProvider* pTheme = GetThemeProvider();
@@ -92,7 +92,7 @@
m_Properties.m_dwStates |= FWL_STATE_CKB_Checked;
break;
case 2:
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_CKB_3State)
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_CKB_3State)
m_Properties.m_dwStates |= FWL_STATE_CKB_Neutral;
break;
default:
@@ -130,7 +130,7 @@
FWL_STATE_CKB_Checked) {
dwStates = CFWL_PartState_Checked;
}
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)
dwStates |= CFWL_PartState_Disabled;
else if (m_Properties.m_dwStates & FWL_STATE_CKB_Hovered)
dwStates |= CFWL_PartState_Hovered;
@@ -138,7 +138,7 @@
dwStates |= CFWL_PartState_Pressed;
else
dwStates |= CFWL_PartState_Normal;
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Focused)
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Focused)
dwStates |= CFWL_PartState_Focused;
return dwStates;
}
@@ -151,7 +151,7 @@
void CFWL_CheckBox::NextStates() {
uint32_t dwFirststate = m_Properties.m_dwStates;
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_CKB_RadioButton) {
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_CKB_RadioButton) {
if ((m_Properties.m_dwStates & FWL_STATE_CKB_CheckMask) ==
FWL_STATE_CKB_Unchecked) {
m_Properties.m_dwStates |= FWL_STATE_CKB_Checked;
@@ -160,13 +160,13 @@
if ((m_Properties.m_dwStates & FWL_STATE_CKB_CheckMask) ==
FWL_STATE_CKB_Neutral) {
m_Properties.m_dwStates &= ~FWL_STATE_CKB_CheckMask;
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_CKB_3State)
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_CKB_3State)
m_Properties.m_dwStates |= FWL_STATE_CKB_Checked;
} else if ((m_Properties.m_dwStates & FWL_STATE_CKB_CheckMask) ==
FWL_STATE_CKB_Checked) {
m_Properties.m_dwStates &= ~FWL_STATE_CKB_CheckMask;
} else {
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_CKB_3State)
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_CKB_3State)
m_Properties.m_dwStates |= FWL_STATE_CKB_Neutral;
else
m_Properties.m_dwStates |= FWL_STATE_CKB_Checked;
@@ -229,17 +229,17 @@
}
void CFWL_CheckBox::OnFocusGained() {
- m_Properties.m_dwStates |= FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates |= FWL_STATE_WGT_Focused;
RepaintRect(m_ClientRect);
}
void CFWL_CheckBox::OnFocusLost() {
- m_Properties.m_dwStates &= ~FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates &= ~FWL_STATE_WGT_Focused;
RepaintRect(m_ClientRect);
}
void CFWL_CheckBox::OnLButtonDown() {
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)
return;
m_bBtnDown = true;
@@ -262,7 +262,7 @@
}
void CFWL_CheckBox::OnMouseMove(CFWL_MessageMouse* pMsg) {
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)
return;
bool bRepaint = false;
diff --git a/xfa/fwl/cfwl_checkbox.h b/xfa/fwl/cfwl_checkbox.h
index dbee03d..65e4209 100644
--- a/xfa/fwl/cfwl_checkbox.h
+++ b/xfa/fwl/cfwl_checkbox.h
@@ -19,12 +19,12 @@
#define FWL_STYLEEXT_CKB_SignShapeSquare (4L << 10)
#define FWL_STYLEEXT_CKB_SignShapeStar (5L << 10)
#define FWL_STYLEEXT_CKB_SignShapeMask (7L << 10)
-#define FWL_STATE_CKB_Hovered (1 << FWL_WGTSTATE_MAX)
-#define FWL_STATE_CKB_Pressed (1 << (FWL_WGTSTATE_MAX + 1))
+#define FWL_STATE_CKB_Hovered (1 << FWL_STATE_WGT_MAX)
+#define FWL_STATE_CKB_Pressed (1 << (FWL_STATE_WGT_MAX + 1))
#define FWL_STATE_CKB_Unchecked 0
-#define FWL_STATE_CKB_Checked (1 << (FWL_WGTSTATE_MAX + 2))
-#define FWL_STATE_CKB_Neutral (2 << (FWL_WGTSTATE_MAX + 2))
-#define FWL_STATE_CKB_CheckMask (3L << (FWL_WGTSTATE_MAX + 2))
+#define FWL_STATE_CKB_Checked (1 << (FWL_STATE_WGT_MAX + 2))
+#define FWL_STATE_CKB_Neutral (2 << (FWL_STATE_WGT_MAX + 2))
+#define FWL_STATE_CKB_CheckMask (3L << (FWL_STATE_WGT_MAX + 2))
class CFWL_MessageKey;
class CFWL_MessageMouse;
diff --git a/xfa/fwl/cfwl_combobox.cpp b/xfa/fwl/cfwl_combobox.cpp
index 19dec10..809cb11 100644
--- a/xfa/fwl/cfwl_combobox.cpp
+++ b/xfa/fwl/cfwl_combobox.cpp
@@ -35,8 +35,8 @@
m_pListBox(cppgc::MakeGarbageCollected<CFWL_ComboList>(
app->GetHeap()->GetAllocationHandle(),
app,
- Properties{FWL_WGTSTYLE_Border | FWL_WGTSTYLE_VScroll, 0,
- FWL_WGTSTATE_Invisible},
+ Properties{FWL_STYLE_WGT_Border | FWL_STYLE_WGT_VScroll, 0,
+ FWL_STATE_WGT_Invisible},
this)) {}
CFWL_ComboBox::~CFWL_ComboBox() = default;
@@ -63,18 +63,18 @@
m_pListBox->DeleteAll();
}
-void CFWL_ComboBox::ModifyStylesEx(uint32_t dwStylesExAdded,
- uint32_t dwStylesExRemoved) {
- bool bAddDropDown = !!(dwStylesExAdded & FWL_STYLEEXT_CMB_DropDown);
- bool bDelDropDown = !!(dwStylesExRemoved & FWL_STYLEEXT_CMB_DropDown);
- dwStylesExRemoved &= ~FWL_STYLEEXT_CMB_DropDown;
- m_Properties.m_dwStyleExes |= FWL_STYLEEXT_CMB_DropDown;
+void CFWL_ComboBox::ModifyStyleExts(uint32_t dwStyleExtsAdded,
+ uint32_t dwStyleExtsRemoved) {
+ bool bAddDropDown = !!(dwStyleExtsAdded & FWL_STYLEEXT_CMB_DropDown);
+ bool bDelDropDown = !!(dwStyleExtsRemoved & FWL_STYLEEXT_CMB_DropDown);
+ dwStyleExtsRemoved &= ~FWL_STYLEEXT_CMB_DropDown;
+ m_Properties.m_dwStyleExts |= FWL_STYLEEXT_CMB_DropDown;
if (bAddDropDown)
- m_pEdit->ModifyStylesEx(0, FWL_STYLEEXT_EDT_ReadOnly);
+ m_pEdit->ModifyStyleExts(0, FWL_STYLEEXT_EDT_ReadOnly);
else if (bDelDropDown)
- m_pEdit->ModifyStylesEx(FWL_STYLEEXT_EDT_ReadOnly, 0);
+ m_pEdit->ModifyStyleExts(FWL_STYLEEXT_EDT_ReadOnly, 0);
- CFWL_Widget::ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
+ CFWL_Widget::ModifyStyleExts(dwStyleExtsAdded, dwStyleExtsRemoved);
}
void CFWL_ComboBox::Update() {
@@ -193,10 +193,10 @@
return rect;
}
-void CFWL_ComboBox::EditModifyStylesEx(uint32_t dwStylesExAdded,
- uint32_t dwStylesExRemoved) {
+void CFWL_ComboBox::EditModifyStyleExts(uint32_t dwStyleExtsAdded,
+ uint32_t dwStyleExtsRemoved) {
if (m_pEdit)
- m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
+ m_pEdit->ModifyStyleExts(dwStyleExtsAdded, dwStyleExtsRemoved);
}
void CFWL_ComboBox::ShowDropDownList() {
@@ -227,7 +227,7 @@
GetPopupPos(fPopupMin, fPopupMax, m_WidgetRect, &rtList);
m_pListBox->SetWidgetRect(rtList);
m_pListBox->Update();
- m_pListBox->RemoveStates(FWL_WGTSTATE_Invisible);
+ m_pListBox->RemoveStates(FWL_STATE_WGT_Invisible);
CFWL_Event postEvent(CFWL_Event::Type::PostDropDown, this);
DispatchEvent(&postEvent);
@@ -238,7 +238,7 @@
if (!IsDropListVisible())
return;
- m_pListBox->SetStates(FWL_WGTSTATE_Invisible);
+ m_pListBox->SetStates(FWL_STATE_WGT_Invisible);
RepaintInflatedListBoxRect();
}
@@ -275,7 +275,7 @@
IFWL_ThemeProvider* theme = GetThemeProvider();
float borderWidth = 1;
float fBtn = theme->GetScrollBarWidth();
- if (!(GetStylesEx() & FWL_STYLEEXT_CMB_ReadOnly)) {
+ if (!(GetStyleExts() & FWL_STYLEEXT_CMB_ReadOnly)) {
m_BtnRect =
CFX_RectF(m_ClientRect.right() - fBtn, m_ClientRect.top + borderWidth,
fBtn - borderWidth, m_ClientRect.height - 2 * borderWidth);
@@ -306,7 +306,7 @@
return;
uint32_t dwAdd = 0;
- switch (m_Properties.m_dwStyleExes & FWL_STYLEEXT_CMB_EditHAlignMask) {
+ switch (m_Properties.m_dwStyleExts & FWL_STYLEEXT_CMB_EditHAlignMask) {
case FWL_STYLEEXT_CMB_EditHCenter: {
dwAdd |= FWL_STYLEEXT_EDT_HCenter;
break;
@@ -316,7 +316,7 @@
break;
}
}
- switch (m_Properties.m_dwStyleExes & FWL_STYLEEXT_CMB_EditVAlignMask) {
+ switch (m_Properties.m_dwStyleExts & FWL_STYLEEXT_CMB_EditVAlignMask) {
case FWL_STYLEEXT_CMB_EditVCenter: {
dwAdd |= FWL_STYLEEXT_EDT_VCenter;
break;
@@ -330,12 +330,12 @@
break;
}
}
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_CMB_EditJustified)
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_CMB_EditJustified)
dwAdd |= FWL_STYLEEXT_EDT_Justified;
- m_pEdit->ModifyStylesEx(dwAdd, FWL_STYLEEXT_EDT_HAlignMask |
- FWL_STYLEEXT_EDT_HAlignModeMask |
- FWL_STYLEEXT_EDT_VAlignMask);
+ m_pEdit->ModifyStyleExts(dwAdd, FWL_STYLEEXT_EDT_HAlignMask |
+ FWL_STYLEEXT_EDT_HAlignModeMask |
+ FWL_STYLEEXT_EDT_VAlignMask);
}
void CFWL_ComboBox::ResetListItemAlignment() {
@@ -343,7 +343,7 @@
return;
uint32_t dwAdd = 0;
- switch (m_Properties.m_dwStyleExes & FWL_STYLEEXT_CMB_ListItemAlignMask) {
+ switch (m_Properties.m_dwStyleExts & FWL_STYLEEXT_CMB_ListItemAlignMask) {
case FWL_STYLEEXT_CMB_ListItemCenterAlign: {
dwAdd |= FWL_STYLEEXT_LTB_CenterAlign;
break;
@@ -353,7 +353,7 @@
break;
}
}
- m_pListBox->ModifyStylesEx(dwAdd, FWL_STYLEEXT_CMB_ListItemAlignMask);
+ m_pListBox->ModifyStyleExts(dwAdd, FWL_STYLEEXT_CMB_ListItemAlignMask);
}
void CFWL_ComboBox::ProcessSelChanged(bool bLButtonUp) {
@@ -472,15 +472,15 @@
}
void CFWL_ComboBox::OnFocusGained() {
- m_Properties.m_dwStates |= FWL_WGTSTATE_Focused;
- if ((m_pEdit->GetStates() & FWL_WGTSTATE_Focused) == 0) {
+ m_Properties.m_dwStates |= FWL_STATE_WGT_Focused;
+ if ((m_pEdit->GetStates() & FWL_STATE_WGT_Focused) == 0) {
CFWL_MessageSetFocus msg(nullptr, m_pEdit);
m_pEdit->GetDelegate()->OnProcessMessage(&msg);
}
}
void CFWL_ComboBox::OnFocusLost() {
- m_Properties.m_dwStates &= ~FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates &= ~FWL_STATE_WGT_Focused;
HideDropDownList();
CFWL_MessageKillFocus msg(m_pEdit);
m_pEdit->GetDelegate()->OnProcessMessage(&msg);
diff --git a/xfa/fwl/cfwl_combobox.h b/xfa/fwl/cfwl_combobox.h
index 4e7af7d..e115f75 100644
--- a/xfa/fwl/cfwl_combobox.h
+++ b/xfa/fwl/cfwl_combobox.h
@@ -37,8 +37,8 @@
// CFWL_Widget
void Trace(cppgc::Visitor* visitor) const override;
FWL_Type GetClassID() const override;
- void ModifyStylesEx(uint32_t dwStylesExAdded,
- uint32_t dwStylesExRemoved) override;
+ void ModifyStyleExts(uint32_t dwStyleExtsAdded,
+ uint32_t dwStyleExtsRemoved) override;
void SetStates(uint32_t dwStates) override;
void RemoveStates(uint32_t dwStates) override;
void Update() override;
@@ -67,7 +67,7 @@
bool EditRedo() { return m_pEdit->Redo(); }
bool EditCanCopy() const { return m_pEdit->HasSelection(); }
bool EditCanCut() const {
- if (m_pEdit->GetStylesEx() & FWL_STYLEEXT_EDT_ReadOnly)
+ if (m_pEdit->GetStyleExts() & FWL_STYLEEXT_EDT_ReadOnly)
return false;
return EditCanCopy();
}
@@ -80,7 +80,8 @@
void EditDeSelect() { m_pEdit->ClearSelection(); }
CFX_RectF GetBBox() const;
- void EditModifyStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved);
+ void EditModifyStyleExts(uint32_t dwStyleExtsAdded,
+ uint32_t dwStyleExtsRemoved);
void ShowDropDownList();
void HideDropDownList();
@@ -93,7 +94,7 @@
explicit CFWL_ComboBox(CFWL_App* pApp);
bool IsDropDownStyle() const {
- return !!(m_Properties.m_dwStyleExes & FWL_STYLEEXT_CMB_DropDown);
+ return !!(GetStyleExts() & FWL_STYLEEXT_CMB_DropDown);
}
void MatchEditText();
void SyncEditText(int32_t iListItem);
diff --git a/xfa/fwl/cfwl_comboedit.cpp b/xfa/fwl/cfwl_comboedit.cpp
index ca78b84..8e5c34b 100644
--- a/xfa/fwl/cfwl_comboedit.cpp
+++ b/xfa/fwl/cfwl_comboedit.cpp
@@ -23,7 +23,7 @@
}
void CFWL_ComboEdit::SetSelected() {
- m_Properties.m_dwStates |= FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates |= FWL_STATE_WGT_Focused;
SelectAll();
}
@@ -31,19 +31,19 @@
bool backDefault = true;
switch (pMessage->GetType()) {
case CFWL_Message::Type::kSetFocus: {
- m_Properties.m_dwStates |= FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates |= FWL_STATE_WGT_Focused;
backDefault = false;
break;
}
case CFWL_Message::Type::kKillFocus: {
- m_Properties.m_dwStates &= ~FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates &= ~FWL_STATE_WGT_Focused;
backDefault = false;
break;
}
case CFWL_Message::Type::kMouse: {
CFWL_MessageMouse* pMsg = static_cast<CFWL_MessageMouse*>(pMessage);
if ((pMsg->m_dwCmd == FWL_MouseCommand::LeftButtonDown) &&
- ((m_Properties.m_dwStates & FWL_WGTSTATE_Focused) == 0)) {
+ ((m_Properties.m_dwStates & FWL_STATE_WGT_Focused) == 0)) {
SetSelected();
}
break;
diff --git a/xfa/fwl/cfwl_datetimeedit.cpp b/xfa/fwl/cfwl_datetimeedit.cpp
index 24e8e33..b8ccfff 100644
--- a/xfa/fwl/cfwl_datetimeedit.cpp
+++ b/xfa/fwl/cfwl_datetimeedit.cpp
@@ -26,8 +26,8 @@
CFWL_MessageMouse* pMouse = static_cast<CFWL_MessageMouse*>(pMessage);
if (pMouse->m_dwCmd == FWL_MouseCommand::LeftButtonDown ||
pMouse->m_dwCmd == FWL_MouseCommand::RightButtonDown) {
- if ((m_Properties.m_dwStates & FWL_WGTSTATE_Focused) == 0)
- m_Properties.m_dwStates |= FWL_WGTSTATE_Focused;
+ if ((m_Properties.m_dwStates & FWL_STATE_WGT_Focused) == 0)
+ m_Properties.m_dwStates |= FWL_STATE_WGT_Focused;
CFWL_DateTimePicker* pDateTime =
static_cast<CFWL_DateTimePicker*>(GetOuter());
diff --git a/xfa/fwl/cfwl_datetimepicker.cpp b/xfa/fwl/cfwl_datetimepicker.cpp
index 46c2902..93ea745 100644
--- a/xfa/fwl/cfwl_datetimepicker.cpp
+++ b/xfa/fwl/cfwl_datetimepicker.cpp
@@ -33,8 +33,8 @@
m_pMonthCal(cppgc::MakeGarbageCollected<CFWL_MonthCalendar>(
app->GetHeap()->GetAllocationHandle(),
app,
- Properties{FWL_WGTSTYLE_Popup | FWL_WGTSTYLE_Border, 0,
- FWL_WGTSTATE_Invisible},
+ Properties{FWL_STYLE_WGT_Popup | FWL_STYLE_WGT_Border, 0,
+ FWL_STATE_WGT_Invisible},
this)) {
m_pMonthCal->SetWidgetRect(
CFX_RectF(0, 0, m_pMonthCal->GetAutosizedWidgetRect().Size()));
@@ -174,9 +174,9 @@
return rect;
}
-void CFWL_DateTimePicker::ModifyEditStylesEx(uint32_t dwStylesExAdded,
- uint32_t dwStylesExRemoved) {
- m_pEdit->ModifyStylesEx(dwStylesExAdded, dwStylesExRemoved);
+void CFWL_DateTimePicker::ModifyEditStyleExts(uint32_t dwStyleExtsAdded,
+ uint32_t dwStyleExtsRemoved) {
+ m_pEdit->ModifyStyleExts(dwStyleExtsAdded, dwStyleExtsRemoved);
}
void CFWL_DateTimePicker::DrawDropDownButton(CFGAS_GEGraphics* pGraphics,
@@ -192,7 +192,7 @@
WideString CFWL_DateTimePicker::FormatDateString(int32_t iYear,
int32_t iMonth,
int32_t iDay) {
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_DTP_ShortDateFormat)
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_DTP_ShortDateFormat)
return WideString::Format(L"%d-%d-%d", iYear, iMonth, iDay);
return WideString::Format(L"%d Year %d Month %d Day", iYear, iMonth, iDay);
@@ -214,7 +214,7 @@
if (m_iYear > 0 && m_iMonth > 0 && m_iDay > 0)
m_pMonthCal->SetSelect(m_iYear, m_iMonth, m_iDay);
m_pMonthCal->Update();
- m_pMonthCal->RemoveStates(FWL_WGTSTATE_Invisible);
+ m_pMonthCal->RemoveStates(FWL_STATE_WGT_Invisible);
CFWL_MessageSetFocus msg(m_pEdit, m_pMonthCal);
m_pEdit->GetDelegate()->OnProcessMessage(&msg);
@@ -225,7 +225,7 @@
if (!IsMonthCalendarVisible())
return;
- m_pMonthCal->SetStates(FWL_WGTSTATE_Invisible);
+ m_pMonthCal->SetStates(FWL_STATE_WGT_Invisible);
RepaintInflatedMonthCalRect();
}
@@ -246,7 +246,7 @@
return;
uint32_t dwAdd = 0;
- switch (m_Properties.m_dwStyleExes & FWL_STYLEEXT_DTP_EditHAlignMask) {
+ switch (m_Properties.m_dwStyleExts & FWL_STYLEEXT_DTP_EditHAlignMask) {
case FWL_STYLEEXT_DTP_EditHCenter: {
dwAdd |= FWL_STYLEEXT_EDT_HCenter;
break;
@@ -260,7 +260,7 @@
break;
}
}
- switch (m_Properties.m_dwStyleExes & FWL_STYLEEXT_DTP_EditVAlignMask) {
+ switch (m_Properties.m_dwStyleExts & FWL_STYLEEXT_DTP_EditVAlignMask) {
case FWL_STYLEEXT_DTP_EditVCenter: {
dwAdd |= FWL_STYLEEXT_EDT_VCenter;
break;
@@ -274,12 +274,12 @@
break;
}
}
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_DTP_EditJustified)
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_DTP_EditJustified)
dwAdd |= FWL_STYLEEXT_EDT_Justified;
- m_pEdit->ModifyStylesEx(dwAdd, FWL_STYLEEXT_EDT_HAlignMask |
- FWL_STYLEEXT_EDT_HAlignModeMask |
- FWL_STYLEEXT_EDT_VAlignMask);
+ m_pEdit->ModifyStyleExts(dwAdd, FWL_STYLEEXT_EDT_HAlignMask |
+ FWL_STYLEEXT_EDT_HAlignModeMask |
+ FWL_STYLEEXT_EDT_VAlignMask);
}
void CFWL_DateTimePicker::ProcessSelChanged(int32_t iYear,
@@ -297,9 +297,9 @@
}
bool CFWL_DateTimePicker::NeedsToShowButton() const {
- return m_Properties.m_dwStates & FWL_WGTSTATE_Focused ||
- m_pMonthCal->GetStates() & FWL_WGTSTATE_Focused ||
- m_pEdit->GetStates() & FWL_WGTSTATE_Focused;
+ return m_Properties.m_dwStates & FWL_STATE_WGT_Focused ||
+ m_pMonthCal->GetStates() & FWL_STATE_WGT_Focused ||
+ m_pEdit->GetStates() & FWL_STATE_WGT_Focused;
}
void CFWL_DateTimePicker::OnProcessMessage(CFWL_Message* pMessage) {
@@ -331,7 +331,7 @@
break;
}
case CFWL_Message::Type::kKey: {
- if (m_pEdit->GetStates() & FWL_WGTSTATE_Focused) {
+ if (m_pEdit->GetStates() & FWL_STATE_WGT_Focused) {
m_pEdit->GetDelegate()->OnProcessMessage(pMessage);
return;
}
@@ -351,8 +351,8 @@
}
void CFWL_DateTimePicker::OnFocusGained(CFWL_Message* pMsg) {
- m_Properties.m_dwStates |= FWL_WGTSTATE_Focused;
- if (m_pEdit && !(m_pEdit->GetStylesEx() & FWL_STYLEEXT_EDT_ReadOnly)) {
+ m_Properties.m_dwStates |= FWL_STATE_WGT_Focused;
+ if (m_pEdit && !(m_pEdit->GetStyleExts() & FWL_STYLEEXT_EDT_ReadOnly)) {
m_BtnRect =
CFX_RectF(m_WidgetRect.width, 0, m_fBtn, m_WidgetRect.height - 1);
}
@@ -365,10 +365,10 @@
void CFWL_DateTimePicker::OnFocusLost(CFWL_Message* pMsg) {
CFX_RectF rtInvalidate(m_BtnRect);
- m_Properties.m_dwStates &= ~FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates &= ~FWL_STATE_WGT_Focused;
m_BtnRect = CFX_RectF();
HideMonthCalendar();
- if (m_pEdit->GetStates() & FWL_WGTSTATE_Focused) {
+ if (m_pEdit->GetStates() & FWL_STATE_WGT_Focused) {
pMsg->SetSrcTarget(m_pEdit);
m_pEdit->GetDelegate()->OnProcessMessage(pMsg);
}
diff --git a/xfa/fwl/cfwl_datetimepicker.h b/xfa/fwl/cfwl_datetimepicker.h
index d5d2430..3e45630 100644
--- a/xfa/fwl/cfwl_datetimepicker.h
+++ b/xfa/fwl/cfwl_datetimepicker.h
@@ -70,7 +70,8 @@
CFX_RectF GetBBox() const;
void SetEditLimit(int32_t nLimit) { m_pEdit->SetLimit(nLimit); }
- void ModifyEditStylesEx(uint32_t dwStylesExAdded, uint32_t dwStylesExRemoved);
+ void ModifyEditStyleExts(uint32_t dwStyleExtsAdded,
+ uint32_t dwStyleExtsRemoved);
bool IsMonthCalendarVisible() const;
void ShowMonthCalendar();
diff --git a/xfa/fwl/cfwl_edit.cpp b/xfa/fwl/cfwl_edit.cpp
index c7a33fb..7fb7c64 100644
--- a/xfa/fwl/cfwl_edit.cpp
+++ b/xfa/fwl/cfwl_edit.cpp
@@ -58,7 +58,7 @@
void CFWL_Edit::PreFinalize() {
m_pEditEngine->SetDelegate(nullptr);
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Focused)
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Focused)
HideCaret(nullptr);
CFWL_Widget::PreFinalize();
}
@@ -75,7 +75,7 @@
CFX_RectF CFWL_Edit::GetWidgetRect() {
CFX_RectF rect = m_WidgetRect;
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_OuterScrollbar) {
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_OuterScrollbar) {
float scrollbarWidth = GetThemeProvider()->GetScrollBarWidth();
if (IsShowVertScrollBar()) {
rect.width += scrollbarWidth;
@@ -90,7 +90,7 @@
if (m_pEditEngine->GetLength() > 0) {
CFX_SizeF size = CalcTextSize(
m_pEditEngine->GetText(),
- !!(m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine));
+ !!(m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_MultiLine));
rect = CFX_RectF(0, 0, size);
}
InflateWidgetRect(rect);
@@ -98,8 +98,8 @@
}
void CFWL_Edit::SetStates(uint32_t dwStates) {
- if ((m_Properties.m_dwStates & FWL_WGTSTATE_Invisible) ||
- (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)) {
+ if ((m_Properties.m_dwStates & FWL_STATE_WGT_Invisible) ||
+ (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)) {
HideCaret(nullptr);
}
CFWL_Widget::SetStates(dwStates);
@@ -120,7 +120,7 @@
}
FWL_WidgetHit CFWL_Edit::HitTest(const CFX_PointF& point) {
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_OuterScrollbar) {
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_OuterScrollbar) {
if (IsShowVertScrollBar()) {
if (m_pVertScrollBar->GetWidgetRect().Contains(point))
return FWL_WidgetHit::VScrollBar;
@@ -252,14 +252,14 @@
void CFWL_Edit::OnCaretChanged() {
if (m_EngineRect.IsEmpty())
return;
- if ((m_Properties.m_dwStates & FWL_WGTSTATE_Focused) == 0)
+ if ((m_Properties.m_dwStates & FWL_STATE_WGT_Focused) == 0)
return;
bool bRepaintContent = UpdateOffset();
UpdateCaret();
CFX_RectF rtInvalid;
bool bRepaintScroll = false;
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine) {
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_MultiLine) {
CFWL_ScrollBar* pScroll = UpdateScroll();
if (pScroll) {
rtInvalid = pScroll->GetWidgetRect();
@@ -286,7 +286,7 @@
}
void CFWL_Edit::OnTextChanged() {
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_VAlignMask)
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_VAlignMask)
UpdateVAlignment();
LayoutScrollBar();
@@ -310,7 +310,7 @@
void CFWL_Edit::DrawContent(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& mtMatrix) {
pGraphics->SaveGraphState();
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_CombText)
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_CombText)
pGraphics->SaveGraphState();
CFX_RectF rtClip = m_EngineRect;
@@ -321,7 +321,7 @@
rtClip = mtMatrix.TransformRect(rtClip);
mt.Concat(mtMatrix);
- bool bShowSel = !!(m_Properties.m_dwStates & FWL_WGTSTATE_Focused);
+ bool bShowSel = !!(m_Properties.m_dwStates & FWL_STATE_WGT_Focused);
if (bShowSel && m_pEditEngine->HasSelection()) {
size_t sel_start;
size_t count;
@@ -347,7 +347,7 @@
CFX_RenderDevice* pRenderDev = pGraphics->GetRenderDevice();
RenderText(pRenderDev, rtClip, mt);
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_CombText) {
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_CombText) {
pGraphics->RestoreGraphState();
CFGAS_GEPath path;
@@ -411,15 +411,15 @@
void CFWL_Edit::UpdateEditParams() {
m_pEditEngine->SetAvailableWidth(m_EngineRect.width);
m_pEditEngine->SetCombText(
- !!(m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_CombText));
+ !!(m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_CombText));
m_pEditEngine->EnableValidation(
- !!(m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_Validate));
+ !!(m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_Validate));
m_pEditEngine->EnablePasswordMode(
- !!(m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_Password));
+ !!(m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_Password));
uint32_t alignment = 0;
- switch (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_HAlignMask) {
+ switch (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_HAlignMask) {
case FWL_STYLEEXT_EDT_HNear: {
alignment |= CFX_TxtLineAlignment_Left;
break;
@@ -435,7 +435,7 @@
default:
break;
}
- switch (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_HAlignModeMask) {
+ switch (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_HAlignModeMask) {
case FWL_STYLEEXT_EDT_Justified: {
alignment |= CFX_TxtLineAlignment_Justified;
break;
@@ -446,13 +446,13 @@
m_pEditEngine->SetAlignment(alignment);
bool auto_hscroll =
- !!(m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_AutoHScroll);
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine) {
+ !!(m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_AutoHScroll);
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_MultiLine) {
m_pEditEngine->EnableMultiLine(true);
m_pEditEngine->EnableLineWrap(!auto_hscroll);
m_pEditEngine->LimitVerticalScroll(
- (m_Properties.m_dwStyles & FWL_WGTSTYLE_VScroll) == 0 &&
- (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_AutoVScroll) == 0);
+ (m_Properties.m_dwStyles & FWL_STYLE_WGT_VScroll) == 0 &&
+ (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_AutoVScroll) == 0);
} else {
m_pEditEngine->EnableMultiLine(false);
m_pEditEngine->EnableLineWrap(false);
@@ -536,14 +536,14 @@
const float fSpaceBelow = pSpace.height >= 0.1f ? pSpace.height : 0.0f;
float fOffsetY = 0.0f;
CFX_RectF contents_bounds = m_pEditEngine->GetContentsBoundingBox();
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_VCenter) {
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_VCenter) {
fOffsetY = (m_EngineRect.height - contents_bounds.height) / 2.0f;
if (fOffsetY < (fSpaceAbove + fSpaceBelow) / 2.0f &&
fSpaceAbove < fSpaceBelow) {
return;
}
fOffsetY += (fSpaceAbove - fSpaceBelow) / 2.0f;
- } else if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_VFar) {
+ } else if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_VFar) {
fOffsetY = (m_EngineRect.height - contents_bounds.height);
fOffsetY -= fSpaceBelow;
} else {
@@ -565,7 +565,7 @@
rtCaret.width = right - rtCaret.left;
}
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Focused && !rtCaret.IsEmpty())
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Focused && !rtCaret.IsEmpty())
ShowCaret(&rtCaret);
else
HideCaret(&rtCaret);
@@ -588,13 +588,13 @@
m_pVertScrollBar->SetTrackPos(fPos);
m_pVertScrollBar->SetPageSize(rtScroll.height);
m_pVertScrollBar->SetStepSize(fStep);
- m_pVertScrollBar->RemoveStates(FWL_WGTSTATE_Disabled);
+ m_pVertScrollBar->RemoveStates(FWL_STATE_WGT_Disabled);
m_pVertScrollBar->Update();
return m_pVertScrollBar;
}
- if ((m_pVertScrollBar->GetStates() & FWL_WGTSTATE_Disabled) == 0) {
+ if ((m_pVertScrollBar->GetStates() & FWL_STATE_WGT_Disabled) == 0) {
m_pVertScrollBar->SetRange(0, -1);
- m_pVertScrollBar->SetStates(FWL_WGTSTATE_Disabled);
+ m_pVertScrollBar->SetStates(FWL_STATE_WGT_Disabled);
m_pVertScrollBar->Update();
return m_pVertScrollBar;
}
@@ -603,10 +603,10 @@
bool CFWL_Edit::IsShowVertScrollBar() const {
const bool bShow =
- !(m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_ShowScrollbarFocus) ||
- (m_Properties.m_dwStates & FWL_WGTSTATE_Focused);
- return bShow && (m_Properties.m_dwStyles & FWL_WGTSTYLE_VScroll) &&
- (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_MultiLine) &&
+ !(m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_ShowScrollbarFocus) ||
+ (m_Properties.m_dwStates & FWL_STATE_WGT_Focused);
+ return bShow && (m_Properties.m_dwStyles & FWL_STYLE_WGT_VScroll) &&
+ (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_MultiLine) &&
IsContentHeightOverflow();
}
@@ -638,7 +638,7 @@
InitVerticalScrollBar();
CFX_RectF rtVertScr;
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_OuterScrollbar) {
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_OuterScrollbar) {
rtVertScr = CFX_RectF(m_ClientRect.right() + kEditMargin,
m_ClientRect.top, fWidth, m_ClientRect.height);
} else {
@@ -648,15 +648,15 @@
}
m_pVertScrollBar->SetWidgetRect(rtVertScr);
- m_pVertScrollBar->RemoveStates(FWL_WGTSTATE_Invisible);
+ m_pVertScrollBar->RemoveStates(FWL_STATE_WGT_Invisible);
m_pVertScrollBar->Update();
} else if (m_pVertScrollBar) {
- m_pVertScrollBar->SetStates(FWL_WGTSTATE_Invisible);
+ m_pVertScrollBar->SetStates(FWL_STATE_WGT_Invisible);
}
}
void CFWL_Edit::LayoutScrollBar() {
- if (!(m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_ShowScrollbarFocus))
+ if (!(m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_ShowScrollbarFocus))
return;
bool bShowVertScrollbar = IsShowVertScrollBar();
@@ -666,7 +666,7 @@
if (!m_pVertScrollBar) {
InitVerticalScrollBar();
CFX_RectF rtVertScr;
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_OuterScrollbar) {
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_OuterScrollbar) {
rtVertScr = CFX_RectF(m_ClientRect.right() + kEditMargin,
m_ClientRect.top, fWidth, m_ClientRect.height);
} else {
@@ -676,9 +676,9 @@
m_pVertScrollBar->SetWidgetRect(rtVertScr);
m_pVertScrollBar->Update();
}
- m_pVertScrollBar->RemoveStates(FWL_WGTSTATE_Invisible);
+ m_pVertScrollBar->RemoveStates(FWL_STATE_WGT_Invisible);
} else if (m_pVertScrollBar) {
- m_pVertScrollBar->SetStates(FWL_WGTSTATE_Invisible);
+ m_pVertScrollBar->SetStates(FWL_STATE_WGT_Invisible);
}
if (bShowVertScrollbar)
UpdateScroll();
@@ -696,7 +696,7 @@
m_pVertScrollBar = cppgc::MakeGarbageCollected<CFWL_ScrollBar>(
GetFWLApp()->GetHeap()->GetAllocationHandle(), GetFWLApp(),
Properties{0, FWL_STYLEEXT_SCB_Vert,
- FWL_WGTSTATE_Disabled | FWL_WGTSTATE_Invisible},
+ FWL_STATE_WGT_Disabled | FWL_STATE_WGT_Invisible},
this);
}
@@ -853,7 +853,7 @@
}
void CFWL_Edit::OnFocusGained() {
- m_Properties.m_dwStates |= FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates |= FWL_STATE_WGT_Focused;
UpdateVAlignment();
UpdateOffset();
UpdateCaret();
@@ -862,8 +862,8 @@
void CFWL_Edit::OnFocusLost() {
bool bRepaint = false;
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Focused) {
- m_Properties.m_dwStates &= ~FWL_WGTSTATE_Focused;
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Focused) {
+ m_Properties.m_dwStates &= ~FWL_STATE_WGT_Focused;
HideCaret(nullptr);
if (HasSelection()) {
ClearSelection();
@@ -879,7 +879,7 @@
}
void CFWL_Edit::OnLButtonDown(CFWL_MessageMouse* pMsg) {
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)
return;
m_bLButtonDown = true;
@@ -988,8 +988,8 @@
: m_pEditEngine->GetIndexAtEndOfLine(m_CursorPosition));
break;
case XFA_FWL_VKEY_Delete: {
- if ((m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_ReadOnly) ||
- (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)) {
+ if ((m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_ReadOnly) ||
+ (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)) {
break;
}
@@ -1013,8 +1013,8 @@
}
void CFWL_Edit::OnChar(CFWL_MessageKey* pMsg) {
- if ((m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_ReadOnly) ||
- (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)) {
+ if ((m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_ReadOnly) ||
+ (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)) {
return;
}
@@ -1036,7 +1036,7 @@
SetCursorPosition(m_CursorPosition + 1);
break;
case L'\r':
- if (m_Properties.m_dwStyleExes & FWL_STYLEEXT_EDT_WantReturn) {
+ if (m_Properties.m_dwStyleExts & FWL_STYLEEXT_EDT_WantReturn) {
m_pEditEngine->Insert(m_CursorPosition, L"\n");
SetCursorPosition(m_CursorPosition + 1);
}
diff --git a/xfa/fwl/cfwl_listbox.cpp b/xfa/fwl/cfwl_listbox.cpp
index 0f74968..118af64 100644
--- a/xfa/fwl/cfwl_listbox.cpp
+++ b/xfa/fwl/cfwl_listbox.cpp
@@ -51,7 +51,7 @@
if (IsLocked())
return;
- switch (m_Properties.m_dwStyleExes & FWL_STYLEEXT_LTB_AlignMask) {
+ switch (m_Properties.m_dwStyleExts & FWL_STYLEEXT_LTB_AlignMask) {
case FWL_STYLEEXT_LTB_LeftAlign:
m_iTTOAligns = FDE_TextAlignment::kCenterLeft;
break;
@@ -100,7 +100,7 @@
rtClip.width -= m_fScorllBarWidth;
pGraphics->SetClipRect(matrix.TransformRect(rtClip));
- if ((m_Properties.m_dwStyles & FWL_WGTSTYLE_NoBackground) == 0)
+ if ((m_Properties.m_dwStyles & FWL_STYLE_WGT_NoBackground) == 0)
DrawBkground(pGraphics, matrix);
DrawItems(pGraphics, matrix);
@@ -216,7 +216,7 @@
}
bool CFWL_ListBox::IsMultiSelection() const {
- return m_Properties.m_dwStyleExes & FWL_STYLEEXT_LTB_MultiSelection;
+ return m_Properties.m_dwStyleExts & FWL_STYLEEXT_LTB_MultiSelection;
}
bool CFWL_ListBox::IsItemSelected(Item* pItem) {
@@ -383,12 +383,12 @@
const CFX_Matrix& mtMatrix) {
uint32_t dwItemStyles = pItem ? pItem->GetStates() : 0;
uint32_t dwPartStates = CFWL_PartState_Normal;
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)
dwPartStates = CFWL_PartState_Disabled;
else if (dwItemStyles & FWL_ITEMSTATE_LTB_Selected)
dwPartStates = CFWL_PartState_Selected;
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Focused &&
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Focused &&
dwItemStyles & FWL_ITEMSTATE_LTB_Focused) {
dwPartStates |= CFWL_PartState_Focused;
}
@@ -464,7 +464,7 @@
float iHeight = m_ClientRect.height;
bool bShowVertScr = false;
bool bShowHorzScr = false;
- if (!bShowVertScr && (m_Properties.m_dwStyles & FWL_WGTSTYLE_VScroll))
+ if (!bShowVertScr && (m_Properties.m_dwStyles & FWL_STYLE_WGT_VScroll))
bShowVertScr = (fs.height > iHeight);
CFX_SizeF szRange;
@@ -490,16 +490,16 @@
pdfium::clamp(m_pVertScrollBar->GetPos(), 0.0f, szRange.height);
m_pVertScrollBar->SetPos(fPos);
m_pVertScrollBar->SetTrackPos(fPos);
- if ((m_Properties.m_dwStyleExes & FWL_STYLEEXT_LTB_ShowScrollBarFocus) ==
+ if ((m_Properties.m_dwStyleExts & FWL_STYLEEXT_LTB_ShowScrollBarFocus) ==
0 ||
- (m_Properties.m_dwStates & FWL_WGTSTATE_Focused)) {
- m_pVertScrollBar->RemoveStates(FWL_WGTSTATE_Invisible);
+ (m_Properties.m_dwStates & FWL_STATE_WGT_Focused)) {
+ m_pVertScrollBar->RemoveStates(FWL_STATE_WGT_Invisible);
}
m_pVertScrollBar->Update();
} else if (m_pVertScrollBar) {
m_pVertScrollBar->SetPos(0);
m_pVertScrollBar->SetTrackPos(0);
- m_pVertScrollBar->SetStates(FWL_WGTSTATE_Invisible);
+ m_pVertScrollBar->SetStates(FWL_STATE_WGT_Invisible);
}
if (bShowHorzScr) {
if (!m_pHorzScrollBar)
@@ -522,16 +522,16 @@
pdfium::clamp(m_pHorzScrollBar->GetPos(), 0.0f, szRange.height);
m_pHorzScrollBar->SetPos(fPos);
m_pHorzScrollBar->SetTrackPos(fPos);
- if ((m_Properties.m_dwStyleExes & FWL_STYLEEXT_LTB_ShowScrollBarFocus) ==
+ if ((m_Properties.m_dwStyleExts & FWL_STYLEEXT_LTB_ShowScrollBarFocus) ==
0 ||
- (m_Properties.m_dwStates & FWL_WGTSTATE_Focused)) {
- m_pHorzScrollBar->RemoveStates(FWL_WGTSTATE_Invisible);
+ (m_Properties.m_dwStates & FWL_STATE_WGT_Focused)) {
+ m_pHorzScrollBar->RemoveStates(FWL_STATE_WGT_Invisible);
}
m_pHorzScrollBar->Update();
} else if (m_pHorzScrollBar) {
m_pHorzScrollBar->SetPos(0);
m_pHorzScrollBar->SetTrackPos(0);
- m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Invisible);
+ m_pHorzScrollBar->SetStates(FWL_STATE_WGT_Invisible);
}
if (bShowVertScr && bShowHorzScr) {
m_StaticRect = CFX_RectF(m_ClientRect.right() - m_fScorllBarWidth,
@@ -583,7 +583,7 @@
m_pVertScrollBar = cppgc::MakeGarbageCollected<CFWL_ScrollBar>(
GetFWLApp()->GetHeap()->GetAllocationHandle(), GetFWLApp(),
- Properties{0, FWL_STYLEEXT_SCB_Vert, FWL_WGTSTATE_Invisible}, this);
+ Properties{0, FWL_STYLEEXT_SCB_Vert, FWL_STATE_WGT_Invisible}, this);
}
void CFWL_ListBox::InitHorizontalScrollBar() {
@@ -592,7 +592,7 @@
m_pHorzScrollBar = cppgc::MakeGarbageCollected<CFWL_ScrollBar>(
GetFWLApp()->GetHeap()->GetAllocationHandle(), GetFWLApp(),
- Properties{0, FWL_STYLEEXT_SCB_Horz, FWL_WGTSTATE_Invisible}, this);
+ Properties{0, FWL_STYLEEXT_SCB_Horz, FWL_STATE_WGT_Invisible}, this);
}
bool CFWL_ListBox::IsShowVertScrollBar() const {
@@ -606,8 +606,8 @@
}
bool CFWL_ListBox::ScrollBarPropertiesPresent() const {
- return !(m_Properties.m_dwStyleExes & FWL_STYLEEXT_LTB_ShowScrollBarFocus) ||
- (m_Properties.m_dwStates & FWL_WGTSTATE_Focused);
+ return !(m_Properties.m_dwStyleExts & FWL_STYLEEXT_LTB_ShowScrollBarFocus) ||
+ (m_Properties.m_dwStates & FWL_STATE_WGT_Focused);
}
void CFWL_ListBox::OnProcessMessage(CFWL_Message* pMessage) {
@@ -673,24 +673,24 @@
}
void CFWL_ListBox::OnFocusGained() {
- if (GetStylesEx() & FWL_STYLEEXT_LTB_ShowScrollBarFocus) {
+ if (GetStyleExts() & FWL_STYLEEXT_LTB_ShowScrollBarFocus) {
if (m_pVertScrollBar)
- m_pVertScrollBar->RemoveStates(FWL_WGTSTATE_Invisible);
+ m_pVertScrollBar->RemoveStates(FWL_STATE_WGT_Invisible);
if (m_pHorzScrollBar)
- m_pHorzScrollBar->RemoveStates(FWL_WGTSTATE_Invisible);
+ m_pHorzScrollBar->RemoveStates(FWL_STATE_WGT_Invisible);
}
- m_Properties.m_dwStates |= FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates |= FWL_STATE_WGT_Focused;
RepaintRect(m_ClientRect);
}
void CFWL_ListBox::OnFocusLost() {
- if (GetStylesEx() & FWL_STYLEEXT_LTB_ShowScrollBarFocus) {
+ if (GetStyleExts() & FWL_STYLEEXT_LTB_ShowScrollBarFocus) {
if (m_pVertScrollBar)
- m_pVertScrollBar->SetStates(FWL_WGTSTATE_Invisible);
+ m_pVertScrollBar->SetStates(FWL_STATE_WGT_Invisible);
if (m_pHorzScrollBar)
- m_pHorzScrollBar->SetStates(FWL_WGTSTATE_Invisible);
+ m_pHorzScrollBar->SetStates(FWL_STATE_WGT_Invisible);
}
- m_Properties.m_dwStates &= ~FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates &= ~FWL_STATE_WGT_Focused;
RepaintRect(m_ClientRect);
}
diff --git a/xfa/fwl/cfwl_pushbutton.cpp b/xfa/fwl/cfwl_pushbutton.cpp
index bd25e59..aad52b2 100644
--- a/xfa/fwl/cfwl_pushbutton.cpp
+++ b/xfa/fwl/cfwl_pushbutton.cpp
@@ -27,8 +27,8 @@
}
void CFWL_PushButton::SetStates(uint32_t dwStates) {
- if (dwStates & FWL_WGTSTATE_Disabled) {
- m_Properties.m_dwStates = FWL_WGTSTATE_Disabled;
+ if (dwStates & FWL_STATE_WGT_Disabled) {
+ m_Properties.m_dwStates = FWL_STATE_WGT_Disabled;
return;
}
CFWL_Widget::SetStates(dwStates);
@@ -60,16 +60,16 @@
param.m_dwStates = GetPartStates();
param.m_matrix = matrix;
param.m_PartRect = m_ClientRect;
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Focused)
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Focused)
param.m_pRtData = &m_CaptionRect;
GetThemeProvider()->DrawBackground(param);
}
uint32_t CFWL_PushButton::GetPartStates() {
uint32_t dwStates = CFWL_PartState_Normal;
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Focused)
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Focused)
dwStates |= CFWL_PartState_Focused;
- if (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)
+ if (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)
dwStates = CFWL_PartState_Disabled;
else if (m_Properties.m_dwStates & FWL_STATE_PSB_Pressed)
dwStates |= CFWL_PartState_Pressed;
@@ -129,12 +129,12 @@
}
void CFWL_PushButton::OnFocusGained() {
- m_Properties.m_dwStates |= FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates |= FWL_STATE_WGT_Focused;
RepaintRect(m_ClientRect);
}
void CFWL_PushButton::OnFocusLost() {
- m_Properties.m_dwStates &= ~FWL_WGTSTATE_Focused;
+ m_Properties.m_dwStates &= ~FWL_STATE_WGT_Focused;
RepaintRect(m_ClientRect);
}
diff --git a/xfa/fwl/cfwl_pushbutton.h b/xfa/fwl/cfwl_pushbutton.h
index f807ca0..4b8998c 100644
--- a/xfa/fwl/cfwl_pushbutton.h
+++ b/xfa/fwl/cfwl_pushbutton.h
@@ -9,8 +9,8 @@
#include "xfa/fwl/cfwl_widget.h"
-#define FWL_STATE_PSB_Hovered (1 << FWL_WGTSTATE_MAX)
-#define FWL_STATE_PSB_Pressed (1 << (FWL_WGTSTATE_MAX + 1))
+#define FWL_STATE_PSB_Hovered (1 << FWL_STATE_WGT_MAX)
+#define FWL_STATE_PSB_Pressed (1 << (FWL_STATE_WGT_MAX + 1))
class CFWL_MessageKey;
class CFWL_MessageMouse;
diff --git a/xfa/fwl/cfwl_scrollbar.cpp b/xfa/fwl/cfwl_scrollbar.cpp
index cc5a101..e5b0bf9 100644
--- a/xfa/fwl/cfwl_scrollbar.cpp
+++ b/xfa/fwl/cfwl_scrollbar.cpp
@@ -79,7 +79,7 @@
CFWL_ThemeBackground param(this, pGraphics);
param.m_iPart = bLower ? CFWL_ThemePart::Part::kLowerTrack
: CFWL_ThemePart::Part::kUpperTrack;
- param.m_dwStates = (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)
+ param.m_dwStates = (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)
? CFWL_PartState_Disabled
: (bLower ? m_iMinTrackState : m_iMaxTrackState);
param.m_matrix = mtMatrix;
@@ -93,7 +93,7 @@
CFWL_ThemeBackground param(this, pGraphics);
param.m_iPart = bMinBtn ? CFWL_ThemePart::Part::kForeArrow
: CFWL_ThemePart::Part::kBackArrow;
- param.m_dwStates = (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)
+ param.m_dwStates = (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)
? CFWL_PartState_Disabled
: (bMinBtn ? m_iMinButtonState : m_iMaxButtonState);
param.m_matrix = mtMatrix;
@@ -106,7 +106,7 @@
const CFX_Matrix& mtMatrix) {
CFWL_ThemeBackground param(this, pGraphics);
param.m_iPart = CFWL_ThemePart::Part::kThumb;
- param.m_dwStates = (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled)
+ param.m_dwStates = (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled)
? CFWL_PartState_Disabled
: m_iThumbButtonState;
param.m_matrix = mtMatrix;
diff --git a/xfa/fwl/cfwl_scrollbar.h b/xfa/fwl/cfwl_scrollbar.h
index b629807..0923a02 100644
--- a/xfa/fwl/cfwl_scrollbar.h
+++ b/xfa/fwl/cfwl_scrollbar.h
@@ -59,9 +59,7 @@
const Properties& properties,
CFWL_Widget* pOuter);
- bool IsVertical() const {
- return !!(m_Properties.m_dwStyleExes & FWL_STYLEEXT_SCB_Vert);
- }
+ bool IsVertical() const { return !!(GetStyleExts() & FWL_STYLEEXT_SCB_Vert); }
void DrawTrack(CFGAS_GEGraphics* pGraphics,
bool bLower,
const CFX_Matrix& mtMatrix);
diff --git a/xfa/fwl/cfwl_widget.cpp b/xfa/fwl/cfwl_widget.cpp
index dc32578..dce10de 100644
--- a/xfa/fwl/cfwl_widget.cpp
+++ b/xfa/fwl/cfwl_widget.cpp
@@ -93,10 +93,10 @@
m_Properties.m_dwStyles |= dwStylesAdded;
}
-void CFWL_Widget::ModifyStylesEx(uint32_t dwStylesExAdded,
- uint32_t dwStylesExRemoved) {
- m_Properties.m_dwStyleExes &= ~dwStylesExRemoved;
- m_Properties.m_dwStyleExes |= dwStylesExAdded;
+void CFWL_Widget::ModifyStyleExts(uint32_t dwStyleExtsAdded,
+ uint32_t dwStyleExtsRemoved) {
+ m_Properties.m_dwStyleExts &= ~dwStyleExtsRemoved;
+ m_Properties.m_dwStyleExts |= dwStyleExtsAdded;
}
static void NotifyHideChildWidget(CFWL_WidgetMgr* widgetMgr,
@@ -173,28 +173,28 @@
}
bool CFWL_Widget::IsEnabled() const {
- return (m_Properties.m_dwStates & FWL_WGTSTATE_Disabled) == 0;
+ return (m_Properties.m_dwStates & FWL_STATE_WGT_Disabled) == 0;
}
bool CFWL_Widget::HasBorder() const {
- return !!(m_Properties.m_dwStyles & FWL_WGTSTYLE_Border);
+ return !!(m_Properties.m_dwStyles & FWL_STYLE_WGT_Border);
}
bool CFWL_Widget::IsVisible() const {
- return !(m_Properties.m_dwStates & FWL_WGTSTATE_Invisible);
+ return !(m_Properties.m_dwStates & FWL_STATE_WGT_Invisible);
}
bool CFWL_Widget::IsOverLapper() const {
- return (m_Properties.m_dwStyles & FWL_WGTSTYLE_WindowTypeMask) ==
- FWL_WGTSTYLE_OverLapper;
+ return (m_Properties.m_dwStyles & FWL_STYLE_WGT_WindowTypeMask) ==
+ FWL_STYLE_WGT_OverLapper;
}
bool CFWL_Widget::IsPopup() const {
- return !!(m_Properties.m_dwStyles & FWL_WGTSTYLE_Popup);
+ return !!(m_Properties.m_dwStyles & FWL_STYLE_WGT_Popup);
}
bool CFWL_Widget::IsChild() const {
- return !!(m_Properties.m_dwStyles & FWL_WGTSTYLE_Child);
+ return !!(m_Properties.m_dwStyles & FWL_STYLE_WGT_Child);
}
CFWL_Widget* CFWL_Widget::GetOutmost() const {
diff --git a/xfa/fwl/cfwl_widget.h b/xfa/fwl/cfwl_widget.h
index 1257e0b..d24ce02 100644
--- a/xfa/fwl/cfwl_widget.h
+++ b/xfa/fwl/cfwl_widget.h
@@ -19,7 +19,6 @@
#include "xfa/fde/cfde_data.h"
#include "xfa/fwl/cfwl_themepart.h"
#include "xfa/fwl/cfwl_widgetmgr.h"
-#include "xfa/fwl/fwl_widgetdef.h"
#include "xfa/fwl/fwl_widgethit.h"
#include "xfa/fwl/ifwl_widgetdelegate.h"
@@ -28,6 +27,20 @@
class CFWL_Widget;
class IFWL_ThemeProvider;
+#define FWL_STYLE_WGT_OverLapper 0
+#define FWL_STYLE_WGT_Popup (1L << 0)
+#define FWL_STYLE_WGT_Child (2L << 0)
+#define FWL_STYLE_WGT_WindowTypeMask (3L << 0)
+#define FWL_STYLE_WGT_Border (1L << 2)
+#define FWL_STYLE_WGT_VScroll (1L << 11)
+#define FWL_STYLE_WGT_Group (1L << 22)
+#define FWL_STYLE_WGT_NoBackground (1L << 28)
+
+#define FWL_STATE_WGT_Disabled (1L << 2)
+#define FWL_STATE_WGT_Focused (1L << 4)
+#define FWL_STATE_WGT_Invisible (1L << 5)
+#define FWL_STATE_WGT_MAX 6
+
enum class FWL_Type {
Unknown = 0,
@@ -64,9 +77,9 @@
class Properties {
public:
- uint32_t m_dwStyles = FWL_WGTSTYLE_Child;
- uint32_t m_dwStyleExes = 0;
- uint32_t m_dwStates = 0;
+ uint32_t m_dwStyles = FWL_STYLE_WGT_Child; // Mask of FWL_STYLE_*_*.
+ uint32_t m_dwStyleExts = 0; // Mask of FWL_STYLEEXT_*_*.
+ uint32_t m_dwStates = 0; // Mask of FWL_STATE_*_*.
};
class ScopedUpdateLock {
@@ -91,8 +104,8 @@
virtual CFX_RectF GetAutosizedWidgetRect();
virtual CFX_RectF GetWidgetRect();
virtual CFX_RectF GetClientRect();
- virtual void ModifyStylesEx(uint32_t dwStylesExAdded,
- uint32_t dwStylesExRemoved);
+ virtual void ModifyStyleExts(uint32_t dwStyleExtsAdded,
+ uint32_t dwStyleExtsRemoved);
virtual void SetStates(uint32_t dwStates);
virtual void RemoveStates(uint32_t dwStates);
virtual void Update() = 0;
@@ -119,7 +132,7 @@
CFWL_Widget* GetOutmost() const;
void ModifyStyles(uint32_t dwStylesAdded, uint32_t dwStylesRemoved);
- uint32_t GetStylesEx() const { return m_Properties.m_dwStyleExes; }
+ uint32_t GetStyleExts() const { return m_Properties.m_dwStyleExts; }
uint32_t GetStates() const { return m_Properties.m_dwStates; }
CFX_PointF TransformTo(CFWL_Widget* pWidget, const CFX_PointF& point);
diff --git a/xfa/fwl/cfwl_widgetmgr.cpp b/xfa/fwl/cfwl_widgetmgr.cpp
index 86a23ae..bed8e41 100644
--- a/xfa/fwl/cfwl_widgetmgr.cpp
+++ b/xfa/fwl/cfwl_widgetmgr.cpp
@@ -135,14 +135,14 @@
CFWL_Widget* CFWL_WidgetMgr::GetDefaultButton(CFWL_Widget* pParent) const {
if ((pParent->GetClassID() == FWL_Type::PushButton) &&
- (pParent->GetStates() & (1 << (FWL_WGTSTATE_MAX + 2)))) {
+ (pParent->GetStates() & (1 << (FWL_STATE_WGT_MAX + 2)))) {
return pParent;
}
CFWL_Widget* child = GetFirstChildWidget(pParent);
while (child) {
if ((child->GetClassID() == FWL_Type::PushButton) &&
- (child->GetStates() & (1 << (FWL_WGTSTATE_MAX + 2)))) {
+ (child->GetStates() & (1 << (FWL_STATE_WGT_MAX + 2)))) {
return child;
}
if (CFWL_Widget* find = GetDefaultButton(child))
diff --git a/xfa/fwl/fwl_widgetdef.h b/xfa/fwl/fwl_widgetdef.h
index 19eb508..b391037 100644
--- a/xfa/fwl/fwl_widgetdef.h
+++ b/xfa/fwl/fwl_widgetdef.h
@@ -7,20 +7,6 @@
#ifndef XFA_FWL_FWL_WIDGETDEF_H_
#define XFA_FWL_FWL_WIDGETDEF_H_
-#define FWL_WGTSTYLE_OverLapper 0
-#define FWL_WGTSTYLE_Popup (1L << 0)
-#define FWL_WGTSTYLE_Child (2L << 0)
-#define FWL_WGTSTYLE_WindowTypeMask (3L << 0)
-#define FWL_WGTSTYLE_Border (1L << 2)
-#define FWL_WGTSTYLE_VScroll (1L << 11)
-#define FWL_WGTSTYLE_Group (1L << 22)
-#define FWL_WGTSTYLE_NoBackground (1L << 28)
-
-#define FWL_WGTSTATE_Disabled (1L << 2)
-#define FWL_WGTSTATE_Focused (1L << 4)
-#define FWL_WGTSTATE_Invisible (1L << 5)
-#define FWL_WGTSTATE_MAX (6)
-
// Same as enum FWL_VKEYCODE in public/fpdf_fwlevent.h, but duplicated to keep
// xfa/fwl standalone.
enum XFA_FWL_VKEYCODE {
diff --git a/xfa/fwl/theme/cfwl_checkboxtp.cpp b/xfa/fwl/theme/cfwl_checkboxtp.cpp
index 0730014..83cd89d 100644
--- a/xfa/fwl/theme/cfwl_checkboxtp.cpp
+++ b/xfa/fwl/theme/cfwl_checkboxtp.cpp
@@ -223,7 +223,7 @@
CFX_RectF rtSign(pRtBox);
uint32_t dwColor = iState & CFWL_PartState_Neutral ? 0xFFA9A9A9 : 0xFF000000;
- uint32_t dwStyle = pWidget->GetStylesEx();
+ uint32_t dwStyle = pWidget->GetStyleExts();
rtSign.Deflate(rtSign.width / 4, rtSign.height / 4);
switch (dwStyle & FWL_STYLEEXT_CKB_SignShapeMask) {
case FWL_STYLEEXT_CKB_SignShapeCheck:
diff --git a/xfa/fwl/theme/cfwl_scrollbartp.cpp b/xfa/fwl/theme/cfwl_scrollbartp.cpp
index aaba320..3134623 100644
--- a/xfa/fwl/theme/cfwl_scrollbartp.cpp
+++ b/xfa/fwl/theme/cfwl_scrollbartp.cpp
@@ -30,7 +30,7 @@
eState = FWLTHEME_STATE_Disable;
CFGAS_GEGraphics* pGraphics = pParams.GetGraphics();
- bool bVert = !!pWidget->GetStylesEx();
+ bool bVert = !!pWidget->GetStyleExts();
switch (pParams.m_iPart) {
case CFWL_ThemePart::Part::kForeArrow: {
DrawMaxMinBtn(pGraphics, pParams.m_PartRect,
diff --git a/xfa/fxfa/cxfa_ffcheckbutton.cpp b/xfa/fxfa/cxfa_ffcheckbutton.cpp
index dbc6c39..c9c5419 100644
--- a/xfa/fxfa/cxfa_ffcheckbutton.cpp
+++ b/xfa/fxfa/cxfa_ffcheckbutton.cpp
@@ -49,7 +49,7 @@
m_pOldDelegate = pCheckBox->GetDelegate();
pCheckBox->SetDelegate(this);
if (m_pNode->IsRadioButton())
- pCheckBox->ModifyStylesEx(FWL_STYLEEXT_CKB_RadioButton, 0xFFFFFFFF);
+ pCheckBox->ModifyStyleExts(FWL_STYLEEXT_CKB_RadioButton, 0xFFFFFFFF);
{
CFWL_Widget::ScopedUpdateLock update_lock(pCheckBox);
@@ -93,7 +93,7 @@
if (button_->IsAllowNeutral())
dwStyleEx |= FWL_STYLEEXT_CKB_3State;
- pCheckBox->ModifyStylesEx(
+ pCheckBox->ModifyStyleExts(
dwStyleEx, FWL_STYLEEXT_CKB_SignShapeMask | FWL_STYLEEXT_CKB_3State);
}
diff --git a/xfa/fxfa/cxfa_ffcombobox.cpp b/xfa/fxfa/cxfa_ffcombobox.cpp
index 1426387..684611f 100644
--- a/xfa/fxfa/cxfa_ffcombobox.cpp
+++ b/xfa/fxfa/cxfa_ffcombobox.cpp
@@ -101,12 +101,12 @@
dwExtendedStyle |= FWL_STYLEEXT_CMB_ReadOnly;
}
dwExtendedStyle |= GetAlignment();
- GetNormalWidget()->ModifyStylesEx(dwExtendedStyle, 0xFFFFFFFF);
+ GetNormalWidget()->ModifyStyleExts(dwExtendedStyle, 0xFFFFFFFF);
if (!m_pNode->IsHorizontalScrollPolicyOff())
dwEditStyles |= FWL_STYLEEXT_EDT_AutoHScroll;
- pComboBox->EditModifyStylesEx(dwEditStyles, 0xFFFFFFFF);
+ pComboBox->EditModifyStyleExts(dwEditStyles, 0xFFFFFFFF);
}
bool CXFA_FFComboBox::OnRButtonUp(uint32_t dwFlags, const CFX_PointF& point) {
diff --git a/xfa/fxfa/cxfa_ffdatetimeedit.cpp b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
index f3f05be..5332a45 100644
--- a/xfa/fxfa/cxfa_ffdatetimeedit.cpp
+++ b/xfa/fxfa/cxfa_ffdatetimeedit.cpp
@@ -89,7 +89,7 @@
uint32_t dwExtendedStyle = FWL_STYLEEXT_DTP_ShortDateFormat;
dwExtendedStyle |= UpdateUIProperty();
dwExtendedStyle |= GetAlignment();
- GetNormalWidget()->ModifyStylesEx(dwExtendedStyle, 0xFFFFFFFF);
+ GetNormalWidget()->ModifyStyleExts(dwExtendedStyle, 0xFFFFFFFF);
uint32_t dwEditStyles = 0;
Optional<int32_t> numCells = m_pNode->GetNumberOfCells();
@@ -102,7 +102,7 @@
if (!m_pNode->IsHorizontalScrollPolicyOff())
dwEditStyles |= FWL_STYLEEXT_EDT_AutoHScroll;
- pPicker->ModifyEditStylesEx(dwEditStyles, 0xFFFFFFFF);
+ pPicker->ModifyEditStyleExts(dwEditStyles, 0xFFFFFFFF);
}
uint32_t CXFA_FFDateTimeEdit::GetAlignment() {
@@ -231,13 +231,13 @@
}
bool CXFA_FFDateTimeEdit::CanCut() {
- if (GetPickerWidget()->GetStylesEx() & FWL_STYLEEXT_EDT_ReadOnly)
+ if (GetPickerWidget()->GetStyleExts() & FWL_STYLEEXT_EDT_ReadOnly)
return false;
return GetPickerWidget()->HasSelection();
}
bool CXFA_FFDateTimeEdit::CanPaste() {
- return !(GetPickerWidget()->GetStylesEx() & FWL_STYLEEXT_EDT_ReadOnly);
+ return !(GetPickerWidget()->GetStyleExts() & FWL_STYLEEXT_EDT_ReadOnly);
}
bool CXFA_FFDateTimeEdit::CanSelectAll() {
diff --git a/xfa/fxfa/cxfa_fflistbox.cpp b/xfa/fxfa/cxfa_fflistbox.cpp
index f6d2e02..7784cda 100644
--- a/xfa/fxfa/cxfa_fflistbox.cpp
+++ b/xfa/fxfa/cxfa_fflistbox.cpp
@@ -51,7 +51,7 @@
CFWL_ListBox* pListBox = cppgc::MakeGarbageCollected<CFWL_ListBox>(
GetFWLApp()->GetHeap()->GetAllocationHandle(), GetFWLApp(),
CFWL_Widget::Properties(), nullptr);
- pListBox->ModifyStyles(FWL_WGTSTYLE_VScroll | FWL_WGTSTYLE_NoBackground,
+ pListBox->ModifyStyles(FWL_STYLE_WGT_VScroll | FWL_STYLE_WGT_NoBackground,
0xFFFFFFFF);
SetNormalWidget(pListBox);
pListBox->SetAdapterIface(this);
@@ -76,7 +76,7 @@
dwExtendedStyle |= FWL_STYLEEXT_LTB_MultiSelection;
dwExtendedStyle |= GetAlignment();
- pListBox->ModifyStylesEx(dwExtendedStyle, 0xFFFFFFFF);
+ pListBox->ModifyStyleExts(dwExtendedStyle, 0xFFFFFFFF);
for (int32_t selected : m_pNode->GetSelectedItems())
pListBox->SetSelItem(pListBox->GetItem(nullptr, selected), true);
}
diff --git a/xfa/fxfa/cxfa_ffnumericedit.cpp b/xfa/fxfa/cxfa_ffnumericedit.cpp
index 1af3cdc..32903f4 100644
--- a/xfa/fxfa/cxfa_ffnumericedit.cpp
+++ b/xfa/fxfa/cxfa_ffnumericedit.cpp
@@ -64,7 +64,7 @@
if (!m_pNode->IsOpenAccess() || !GetDoc()->GetXFADoc()->IsInteractive())
dwExtendedStyle |= FWL_STYLEEXT_EDT_ReadOnly;
- GetNormalWidget()->ModifyStylesEx(dwExtendedStyle, 0xFFFFFFFF);
+ GetNormalWidget()->ModifyStyleExts(dwExtendedStyle, 0xFFFFFFFF);
}
void CXFA_FFNumericEdit::OnProcessEvent(CFWL_Event* pEvent) {
diff --git a/xfa/fxfa/cxfa_ffpasswordedit.cpp b/xfa/fxfa/cxfa_ffpasswordedit.cpp
index 0fccb11..bca431f 100644
--- a/xfa/fxfa/cxfa_ffpasswordedit.cpp
+++ b/xfa/fxfa/cxfa_ffpasswordedit.cpp
@@ -66,5 +66,5 @@
dwExtendedStyle |= FWL_STYLEEXT_EDT_ReadOnly;
dwExtendedStyle |= GetAlignment();
- GetNormalWidget()->ModifyStylesEx(dwExtendedStyle, 0xFFFFFFFF);
+ GetNormalWidget()->ModifyStyleExts(dwExtendedStyle, 0xFFFFFFFF);
}
diff --git a/xfa/fxfa/cxfa_ffpushbutton.cpp b/xfa/fxfa/cxfa_ffpushbutton.cpp
index 844d2e5..9e0ad1b 100644
--- a/xfa/fxfa/cxfa_ffpushbutton.cpp
+++ b/xfa/fxfa/cxfa_ffpushbutton.cpp
@@ -95,7 +95,7 @@
default:
break;
}
- GetNormalWidget()->ModifyStylesEx(dwStyleEx, 0xFFFFFFFF);
+ GetNormalWidget()->ModifyStyleExts(dwStyleEx, 0xFFFFFFFF);
}
bool CXFA_FFPushButton::PerformLayout() {
@@ -213,7 +213,7 @@
void CXFA_FFPushButton::OnDrawWidget(CFGAS_GEGraphics* pGraphics,
const CFX_Matrix& matrix) {
auto* pWidget = GetNormalWidget();
- if (pWidget->GetStylesEx() & XFA_FWL_PSBSTYLEEXT_HiliteInverted) {
+ if (pWidget->GetStyleExts() & XFA_FWL_PSBSTYLEEXT_HiliteInverted) {
if ((pWidget->GetStates() & FWL_STATE_PSB_Pressed) &&
(pWidget->GetStates() & FWL_STATE_PSB_Hovered)) {
CFX_RectF rtFill(0, 0, pWidget->GetWidgetRect().Size());
@@ -228,7 +228,7 @@
return;
}
- if (pWidget->GetStylesEx() & XFA_FWL_PSBSTYLEEXT_HiliteOutLine) {
+ if (pWidget->GetStyleExts() & XFA_FWL_PSBSTYLEEXT_HiliteOutLine) {
if ((pWidget->GetStates() & FWL_STATE_PSB_Pressed) &&
(pWidget->GetStates() & FWL_STATE_PSB_Hovered)) {
float fLineWidth = GetLineWidth();
diff --git a/xfa/fxfa/cxfa_fftextedit.cpp b/xfa/fxfa/cxfa_fftextedit.cpp
index 86fc352..319136c 100644
--- a/xfa/fxfa/cxfa_fftextedit.cpp
+++ b/xfa/fxfa/cxfa_fftextedit.cpp
@@ -85,7 +85,7 @@
if (m_pNode->IsMultiLine()) {
dwExtendedStyle |= FWL_STYLEEXT_EDT_MultiLine | FWL_STYLEEXT_EDT_WantReturn;
if (!m_pNode->IsVerticalScrollPolicyOff()) {
- dwStyle |= FWL_WGTSTYLE_VScroll;
+ dwStyle |= FWL_STYLE_WGT_VScroll;
dwExtendedStyle |= FWL_STYLEEXT_EDT_AutoVScroll;
}
} else if (!m_pNode->IsHorizontalScrollPolicyOff()) {
@@ -115,7 +115,7 @@
dwExtendedStyle |= GetAlignment();
GetNormalWidget()->ModifyStyles(dwStyle, 0xFFFFFFFF);
- GetNormalWidget()->ModifyStylesEx(dwExtendedStyle, 0xFFFFFFFF);
+ GetNormalWidget()->ModifyStyleExts(dwExtendedStyle, 0xFFFFFFFF);
}
bool CXFA_FFTextEdit::AcceptsFocusOnButtonDown(uint32_t dwFlags,
@@ -372,13 +372,13 @@
}
bool CXFA_FFTextEdit::CanCut() {
- if (ToEdit(GetNormalWidget())->GetStylesEx() & FWL_STYLEEXT_EDT_ReadOnly)
+ if (ToEdit(GetNormalWidget())->GetStyleExts() & FWL_STYLEEXT_EDT_ReadOnly)
return false;
return ToEdit(GetNormalWidget())->HasSelection();
}
bool CXFA_FFTextEdit::CanPaste() {
- return !(ToEdit(GetNormalWidget())->GetStylesEx() &
+ return !(ToEdit(GetNormalWidget())->GetStyleExts() &
FWL_STYLEEXT_EDT_ReadOnly);
}