Maintenance: [forced, user-approved] Family F2a (first half of UIWindowContext removal; coordinator-approved bridge split because F2
Batch #10217 by ragnarok-clanker: forced by an admin (236 lower score(s), 885 changed function(s)); checked with 558 compiled unit(s), including every includer of Source/Client/Mode/ModeTooltip.h, Source/Contents/SignBoard/SignBoard.h, Source/UI/Acceptance/UIJoinPartyAcceptWnd.h, Source/UI/AdventureGuide/UIAdventureGuide.h, Source/UI/Buttons/UIBasicButton.h, Source/UI/Buttons/UIBitmapButton.h, Source/UI/Buttons/UIBmpRadioBtn.h, Source/UI/Buttons/UIBmpTextButton.h, Source/UI/Buttons/UIBmpTextButton2.h, Source/UI/Buttons/UIButton.h, Source/UI/Buttons/UICashEmotionSprBtn.h, Source/UI/Buttons/UICheckBox.h, Source/UI/Buttons/UIItemMoveInfo.h, Source/UI/Buttons/UIItemTagButton.h, Source/UI/Buttons/UIJobSlotButton.h, Source/UI/Buttons/UINaviLinkButton.h, Source/UI/Buttons/UINoneVisibleButton.h, Source/UI/Buttons/UIRadioBtn.h, Source/UI/Buttons/UIRadioButton.h, Source/UI/Buttons/UIReplayButton.h, Source/UI/Buttons/UISlotBmpButton.h, Source/UI/Buttons/UISpriteButton.h, Source/UI/Buttons/UITVBitmapButton.h, Source/UI/Buttons/UITVTextButton.h, Source/UI/Buttons/UITagButton.h, Source/UI/Buttons/UITextButton.h, Source/UI/CashEmotion/UICashEmotionPack.h, Source/UI/CashEmotion/UICashEmotionPiece.h, Source/UI/CashShop/UICashShopWnd.h, Source/UI/Chat/UIChatRoomMakeWnd.h, Source/UI/Chat/UIChatRoomTitle.h, Source/UI/Chat/UISubChatHisWnd.h, Source/UI/Chat/UIWhisperWnd.h, Source/UI/Clan/UIClanWnd.h, Source/UI/Dialogs/UIBookWnd.h, Source/UI/Dialogs/UIChooseWarpWnd.h, Source/UI/Dialogs/UIChooseWnd.h, Source/UI/Dialogs/UIDisconnectedServerMsgWnd.h, Source/UI/Dialogs/UIEmailAddressWnd.h, Source/UI/Dialogs/UIGraffiStrboxWnd.h, Source/UI/Dialogs/UILoadingWnd.h, Source/UI/Dialogs/UIMenuWnd.h, Source/UI/Dialogs/UINoticeConfirmWnd.h, Source/UI/Dialogs/UINotifyLevelUpWnd.h, Source/UI/Dialogs/UINotifyQuestWnd.h, Source/UI/Dialogs/UINpcEditDialogWnd.h, Source/UI/Dialogs/UIPasswordWnd.h, Source/UI/Dialogs/UIPetTamingDeceiveWnd.h, Source/UI/Dialogs/UIProhibitListWnd.h, Source/UI/Dialogs/UIQuitWnd.h, Source/UI/Dialogs/UIRestartWnd.h, Source/UI/Dialogs/UISayDialogWnd.h, Source/UI/Dialogs/UISelectCartWnd.h, Source/UI/Dialogs/UITipOfTheDayWnd.h, Source/UI/Dialogs/UITipboxWnd.h, Source/UI/Dialogs/UIToolTipWnd.h, Source/UI/Dialogs/UIWaitDBSaveWnd.h, Source/UI/Dialogs/UIWaitWnd.h, Source/UI/Edit/UICandidateWnd.h, Source/UI/Edit/UIEditBoxEx.h, Source/UI/Edit/UIEditCtrl.h, Source/UI/Edit/UIEditCtrl_Currency.h, Source/UI/Enchant/EnchantUI.h, Source/UI/EntryQueue/UIEntryQueueWnd.h, Source/UI/FrameSkin.h, Source/UI/GameSettings/GameSettingsUI.h, Source/UI/Guild/UIGuild_Storage_Log.h, Source/UI/Item/UIEquipmentPropertiesWnd.h, Source/UI/Item/UIItemBaseWnd.h, Source/UI/Item/UIItemPurchaseWnd.h, Source/UI/Item/UIItemSellWnd.h, Source/UI/Item/UIItemSellWnd2.h, Source/UI/Item/UIItemShopWnd.h, Source/UI/Item/UIItemShopWnd2.h, Source/UI/Item/UIItemStoreFindWnd.h, Source/UI/Item/UIItemStoreSubWnd.h, Source/UI/Item/UIItemStoreWnd.h, Source/UI/Item/UIItemWnd.h, Source/UI/Item/UIMerchantItemLogWnd.h, Source/UI/Items/MergeItemWnd.h, Source/UI/Items/UICardItemIllustWnd.h, Source/UI/Items/UIEquipWnd.h, Source/UI/Items/UIGameItem.h, Source/UI/Items/UIIllustWnd.h, Source/UI/Items/UIItemCollectionWnd.h, Source/UI/Items/UIItemIdentifyWnd.h, Source/UI/Items/UINotifyItemObtainWnd.h, Source/UI/Items/UISpellListWnd.h, Source/UI/Items/UISwapEquipmentWnd.h, Source/UI/Lists/TableBox.h, Source/UI/Lists/UIChatHisBox.h, Source/UI/Lists/UIComboBox.h, Source/UI/Lists/UIComboBoxDefWnd.h, Source/UI/Lists/UIComboBoxEx.h, Source/UI/Lists/UIComboBoxV2Wnd.h, Source/UI/Lists/UIComboBoxWnd.h, Source/UI/Lists/UIDropDownBox.h, Source/UI/Lists/UIItemStoreComboBox.h, Source/UI/Lists/UIListBox.h, Source/UI/Lists/UIListBoxEx.h, Source/UI/Lists/UIListBoxNavi.h, Source/UI/Lists/UIListBoxNaviSearch.h, Source/UI/Lists/UIListBoxTemplate.h, Source/UI/Lists/UIMemberListBox.h, Source/UI/Lists/UIPackageBoxNameList.h, Source/UI/Lists/UIReplayListBox.h, Source/UI/Lists/UIScrollBar.h, Source/UI/Lists/UIScrollBarNavi.h, Source/UI/Lists/UIScrollBarVariants.h, Source/UI/Lists/UITabControl.h, Source/UI/Lists/UIThumb.h, Source/UI/Lists/UITreeView.h, Source/UI/Lists/UIVScrollBar.h, Source/UI/Menu/UIMenuIconWnd.h, Source/UI/Navigation/UINavigationV4Wnd.h, Source/UI/Navigation/UIPrivateAirplaneWnd.h, Source/UI/Party/UIAdvenPartyBoardWnd.h, Source/UI/Party/UIApplyForPartyWnd.h, Source/UI/Party/UIMiniPartyWnd.h, Source/UI/Party/UIPartyInfoWnd.h, Source/UI/Party/UIPartySettingWnd.h, Source/UI/Party/UIRegisterPartyWnd.h, Source/UI/Party/UIRequestJoinPartyWnd.h, Source/UI/Quest/UIOngoingQuestInfo.h, Source/UI/Quest/UIQuestDisplay.h, Source/UI/Quest/UIRecommendedQuestInfo.h, Source/UI/Quest/UIRenewQuestUI.h, Source/UI/Quest/UIRenewQuestWnd.h, Source/UI/Rodex/UIRodexComposeWnd.h, Source/UI/RuneSystem/UIRuneSystemWnd.h, Source/UI/Shop/UIMerchantItemMyShopWnd.h, Source/UI/Shop/UIMerchantItemPurchaseMSGWnd.h, Source/UI/Shop/UIMerchantItemPurchaseWnd.h, Source/UI/Shop/UIMerchantItemShopWnd.h, Source/UI/Shop/UIMerchantItemWnd.h, Source/UI/Shop/UIMerchantMirrorItemWnd.h, Source/UI/Shop/UIMerchantShopTitle.h, Source/UI/Shop/UINoticeMessageBox_LockSellItem.h, Source/UI/Shop/UInCash_CallWnd.h, Source/UI/Shortcuts/UIQuickSlotWnd.h, Source/UI/Skill/UISkillDescribeWnd.h, Source/UI/Skill/UISkillListWnd.h, Source/UI/Skill/UISkillNameChangeWnd.h, Source/UI/SkillDelayInfo/SkillDelayInfo.h, Source/UI/Status/UIStatusWnd.h, Source/UI/StylingShop/UIStylingShopWnd.h, Source/UI/Text/UIAchWnd.h, Source/UI/Text/UIBalloonText.h, Source/UI/Text/UICharInfoBalloonText.h, Source/UI/Text/UINameBalloonText.h, Source/UI/Text/UIStaticText.h, Source/UI/Text/UIStaticTextControl.h, Source/UI/Text/UIStaticText_LF.h, Source/UI/Text/UIString.h, Source/UI/Text/UITagTextViewer.h, Source/UI/Text/UITextViewer.h, Source/UI/Text/UITextViewerControl.h, Source/UI/Text/UITransBalloonText.h, Source/UI/UIBarGraph.h, Source/UI/UIBartermarketWnd.h, Source/UI/UIBasicCtrl.h, Source/UI/UIBroadcastBalloon.h, Source/UI/UICaptchaPreviewWnd.h, Source/UI/UICaptchaRegisterWnd.h, Source/UI/UIChangeMaterialWnd.h, Source/UI/UICheckAttendanceWnd.h, Source/UI/UIGradeEnchantWnd.h, Source/UI/UIHotkeyGuideWnd.h, Source/UI/UIIngredientInfoWnd.h, Source/UI/UIItemReformWnd.h, Source/UI/UILapineScrollBar.h, Source/UI/UILapineUpgradeBoxWnd.h, Source/UI/UIMacroBlackListCheckWnd.h, Source/UI/UIMacroDetectorWnd.h, Source/UI/UIMacroUserInfoWnd.h, Source/UI/UIPreviewEquipWnd.h, Source/UI/UIRefiningWnd.h, Source/UI/UIReputeWnd.h, Source/UI/UIRoundBoxTooltipWnd.h, Source/UI/UIScrollWnd.h, Source/UI/UISlotBitmap.h, Source/UI/UIStaticBitmap.h, Source/UI/UIStaticItem.h, Source/UI/Window/UIAccountLimitedToolWnd.h, Source/UI/Window/UIBalloonOpenBtn.h, Source/UI/Window/UIBank_NewWnd.h, Source/UI/Window/UIBasicInfoWnd.h, Source/UI/Window/UIBattleMsgOptionWnd.h, Source/UI/Window/UIChangeNameWnd.h, Source/UI/Window/UIChatRoomWnd.h, Source/UI/Window/UICntWnd.h, Source/UI/Window/UICollectionSystemWnd.h, Source/UI/Window/UIControl.h, Source/UI/Window/UIDebuffRemoveWnd.h, Source/UI/Window/UIFrameWnd.h, Source/UI/Window/UIHomunInfoWnd.h, Source/UI/Window/UIHotKeyWnd.h, Source/UI/Window/UILoginOTPWnd.h, Source/UI/Window/UILoginWnd.h, Source/UI/Window/UIMakeCharWnd.h, Source/UI/Window/UIMerInfoWnd.h, Source/UI/Window/UIMessageBox.h, Source/UI/Window/UIMessageBoxAutoreturn.h, Source/UI/Window/UIMonsterDisplayWnd.h, Source/UI/Window/UIMonsterInfoWnd.h, Source/UI/Window/UINewMakeCharWnd.h, Source/UI/Window/UINormalMB.h, Source/UI/Window/UINoticeWnd.h, Source/UI/Window/UIPadding.h, Source/UI/Window/UIPayConfirmWnd.h, Source/UI/Window/UIPetInfoWnd.h, Source/UI/Window/UIReplayControlWnd.h, Source/UI/Window/UIReplayRECControlWnd.h, Source/UI/Window/UIResizer.h, Source/UI/Window/UISelectReplayDataWnd.h, Source/UI/Window/UISelectServerWnd.h, Source/UI/Window/UITab.h, Source/UI/Window/UITalkboxTrapInputWnd.h, Source/UI/Window/UIWindow.h, Source/UI/Window/UIWindowMgr.h, Source/UI/Window/UIWordDisplayWnd.h.
This commit is contained in:
parent
4ff2f81567
commit
8ba9c6719a
391 changed files with 2203 additions and 2273 deletions
|
|
@ -158,8 +158,8 @@ bool UnusedTrueA47F10() {
|
|||
// OFFSET: 0x00A47FA0
|
||||
// FUNCTION: fn_16108
|
||||
template <>
|
||||
CUIListBoxEx<ProbabilityTable::CUIItem, ProbabilityTable::CItemData>::CUIListBoxEx(UIWindowContext& context)
|
||||
: CUIControl(context), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast<unsigned int>(-1)),
|
||||
CUIListBoxEx<ProbabilityTable::CUIItem, ProbabilityTable::CItemData>::CUIListBoxEx()
|
||||
: CUIControl(), scrollBar(nullptr), itemWidth(0), rowHeight(0), itemX(0), itemY(0), unknown_00C4(0), selected(static_cast<unsigned int>(-1)),
|
||||
unknown_00E0(1), rebind(0) {
|
||||
}
|
||||
|
||||
|
|
@ -201,7 +201,7 @@ void CUIProbabilityTable::Slot53() {
|
|||
// FUNCTION: fn_16117
|
||||
template <>
|
||||
void CUIListBoxEx<ProbabilityTable::CUIItem, ProbabilityTable::CItemData>::Slot15(int width, int height) {
|
||||
this->scrollBar = new CUIVScrollBar(*this->m_context);
|
||||
this->scrollBar = new CUIVScrollBar();
|
||||
this->scrollBar->Show(0);
|
||||
this->scrollBar->onChange = [this](int position) { this->OnScroll(position); };
|
||||
this->AddChild(this->scrollBar);
|
||||
|
|
@ -217,7 +217,7 @@ CUIItem::CUIItem() : CUIListItem(), nameText(nullptr), probabilityText(nullptr),
|
|||
// OFFSET: 0x00A48A70
|
||||
// FUNCTION: fn_16118
|
||||
void CUIItem::Slot15(int width, int height) {
|
||||
this->nameText = new CUITextViewer(*this->m_context);
|
||||
this->nameText = new CUITextViewer();
|
||||
this->nameText->SetSize(231, 29);
|
||||
this->nameText->Move(1, 0);
|
||||
this->nameText->SetTextOffset(0, 6);
|
||||
|
|
@ -238,7 +238,7 @@ void CUIItem::Slot15(int width, int height) {
|
|||
this->nameText->SetScrollBarThumbImage(std::string());
|
||||
this->AddChild(this->nameText);
|
||||
|
||||
this->probabilityText = new CUITextViewer(*this->m_context);
|
||||
this->probabilityText = new CUITextViewer();
|
||||
this->probabilityText->SetSize(78, 29);
|
||||
this->probabilityText->Move(233, 0);
|
||||
this->probabilityText->SetTextOffset(2, 6);
|
||||
|
|
@ -550,7 +550,7 @@ void BindItem(ProbabilityTable::CUIItem* item, const ProbabilityTable::CItemData
|
|||
// OFFSET: 0x00A493D0
|
||||
// FUNCTION: fn_16119
|
||||
void CUIProbabilityTable::Slot15(int width, int height) {
|
||||
this->m_titleBar = new CUITitleBar(*this->m_context);
|
||||
this->m_titleBar = new CUITitleBar();
|
||||
this->m_titleBar->SetSize(345, 17);
|
||||
this->m_titleBar->Move(0, 0);
|
||||
const std::uint8_t titleRight[] = {
|
||||
|
|
@ -573,7 +573,7 @@ void CUIProbabilityTable::Slot15(int width, int height) {
|
|||
this->m_titleBar->SetImages(std::string(DecryptName<0x0B7109397F6B1387ULL>(titleLeft)), std::string(DecryptName<0x23BBD58F8B5FF5C9ULL>(titleMiddle)), std::string(DecryptName<0xC517FB932D95BB6DULL>(titleRight)));
|
||||
this->AddChild(this->m_titleBar);
|
||||
|
||||
CUIStaticText* title = new CUIStaticText(*this->m_context);
|
||||
CUIStaticText* title = new CUIStaticText();
|
||||
title->SetSize(310, 17);
|
||||
title->Move(18, 0);
|
||||
const std::uint8_t titleTextSource[] = {0x8B, 0x87, 0xE4, 0xDB, 0xF5, 0x0F, 0xB1, 0x29, 0xF0, 0x29};
|
||||
|
|
@ -591,7 +591,7 @@ void CUIProbabilityTable::Slot15(int width, int height) {
|
|||
this->m_titleBar->titleText = title;
|
||||
this->m_titleBar->AddChild(title);
|
||||
|
||||
CUIImageButton* systemButton = new CUIImageButton(*this->m_context);
|
||||
CUIImageButton* systemButton = new CUIImageButton();
|
||||
systemButton->SetSize(11, 11);
|
||||
systemButton->Move(3, 3);
|
||||
systemButton->SetOnClick([this]() { this->OnButtonClick(); });
|
||||
|
|
@ -623,7 +623,7 @@ void CUIProbabilityTable::Slot15(int width, int height) {
|
|||
);
|
||||
this->m_titleBar->AddChild(systemButton);
|
||||
|
||||
CUIImageButton* closeButton = new CUIImageButton(*this->m_context);
|
||||
CUIImageButton* closeButton = new CUIImageButton();
|
||||
closeButton->SetSize(11, 11);
|
||||
closeButton->Move(331, 3);
|
||||
closeButton->SetOnClick([this]() { this->OnClose(); });
|
||||
|
|
@ -657,7 +657,7 @@ void CUIProbabilityTable::Slot15(int width, int height) {
|
|||
);
|
||||
this->m_titleBar->SetSecondButton(closeButton);
|
||||
|
||||
this->m_nameHeader = new CUIStaticText(*this->m_context);
|
||||
this->m_nameHeader = new CUIStaticText();
|
||||
this->m_nameHeader->SetSize(160, 18);
|
||||
this->m_nameHeader->Move(10, 30);
|
||||
const std::uint8_t nameHeaderSource[] = {0x50, 0xC3, 0x45, 0x6D, 0x12, 0xA3, 0x19, 0x6D, 0x2A, 0xC0, 0x0F, 0xD7};
|
||||
|
|
@ -674,7 +674,7 @@ void CUIProbabilityTable::Slot15(int width, int height) {
|
|||
this->m_nameHeader->SetOutline(0, 0xFFFFFF);
|
||||
this->AddChild(this->m_nameHeader);
|
||||
|
||||
this->m_searchEdit = new CUIEditBoxEx(*this->m_context);
|
||||
this->m_searchEdit = new CUIEditBoxEx();
|
||||
this->m_searchEdit->Create(130, 18, false);
|
||||
this->m_searchEdit->Move(180, 30);
|
||||
this->m_searchEdit->SetText("");
|
||||
|
|
@ -689,7 +689,7 @@ void CUIProbabilityTable::Slot15(int width, int height) {
|
|||
this->m_searchEdit->SetOnSubmit([this]() { this->Search(); });
|
||||
this->AddChild(this->m_searchEdit);
|
||||
|
||||
this->m_searchButton = new CUIImageButton(*this->m_context);
|
||||
this->m_searchButton = new CUIImageButton();
|
||||
this->m_searchButton->SetSize(25, 18);
|
||||
this->m_searchButton->Move(310, 30);
|
||||
this->m_searchButton->SetOnClick([this]() { this->Search(); });
|
||||
|
|
@ -725,7 +725,7 @@ void CUIProbabilityTable::Slot15(int width, int height) {
|
|||
);
|
||||
this->AddChild(this->m_searchButton);
|
||||
|
||||
this->m_itemName = new CUIStaticText(*this->m_context);
|
||||
this->m_itemName = new CUIStaticText();
|
||||
this->m_itemName->SetSize(220, 24);
|
||||
this->m_itemName->Move(16, 61);
|
||||
this->m_itemName->SetText("", 0);
|
||||
|
|
@ -740,7 +740,7 @@ void CUIProbabilityTable::Slot15(int width, int height) {
|
|||
this->m_itemName->SetOutline(0, 0xFFFFFF);
|
||||
this->AddChild(this->m_itemName);
|
||||
|
||||
this->m_probabilityHeader = new CUIStaticText(*this->m_context);
|
||||
this->m_probabilityHeader = new CUIStaticText();
|
||||
this->m_probabilityHeader->SetSize(68, 24);
|
||||
this->m_probabilityHeader->Move(248, 61);
|
||||
const std::uint8_t probabilityHeaderSource[] = {0x35, 0x79, 0xFA, 0x55, 0xB5};
|
||||
|
|
@ -757,7 +757,7 @@ void CUIProbabilityTable::Slot15(int width, int height) {
|
|||
this->m_probabilityHeader->SetOutline(0, 0xFFFFFF);
|
||||
this->AddChild(this->m_probabilityHeader);
|
||||
|
||||
this->m_list = new CUIListBoxEx<ProbabilityTable::CUIItem, ProbabilityTable::CItemData>(*this->m_context);
|
||||
this->m_list = new CUIListBoxEx<ProbabilityTable::CUIItem, ProbabilityTable::CItemData>();
|
||||
this->m_list->itemWidth = 312;
|
||||
this->m_list->rowHeight = 30;
|
||||
this->m_list->SetSize(325, 360);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue