backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-06-02 22:33:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove WinAPI state types from XUI controls

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-14 07:04:09 +11:00
parent 99d63ce7ec
commit ad82b86701
9 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Minecraft.Client/Platform/Common/XUI/XUI_Control_ComboBox.h
View file

@ -10,8 +10,8 @@ public:
LPCWSTR pwszText;
LPCWSTR pwszImage;
HXUIBRUSH hXuiBrush;
BOOL fChecked;
BOOL fEnabled;
bool fChecked;
bool fEnabled;
}
LIST_ITEM_INFO;
@ -50,4 +50,4 @@ protected:
HRESULT OnNotifyPressEx(HXUIOBJ hObjPressed, XUINotifyPress* pNotifyPressData,BOOL& rfHandled);
};
};

4
Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_4JList.h
View file

@ -17,8 +17,8 @@ public:
LPCWSTR pwszText;
LPCWSTR pwszImage;
HXUIBRUSH hXuiBrush;
BOOL fChecked;
BOOL fEnabled;
bool fChecked;
bool fEnabled;
bool bIsDamaged; // damaged save
FILETIME fTime;
int iData; // user data

4
Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_EnchantmentBook.h
View file

@ -38,7 +38,7 @@ private:
float flip, oFlip, flipT, flipA;
float open, oOpen;
BOOL m_bDirty;
bool m_bDirty;
float m_fScale,m_fAlpha;
int m_iPad;
CXuiSceneEnchant *m_containerScene;
@ -48,4 +48,4 @@ private:
float m_fRawWidth,m_fRawHeight;
void tickBook();
};
};

4
Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftPlayer.h
View file

@ -31,7 +31,7 @@ protected:
HRESULT OnRender(XUIMessageRender *pRenderData, BOOL &rfHandled);
private:
BOOL m_bDirty;
bool m_bDirty;
float m_fScale,m_fAlpha;
int m_iPad;
CXuiSceneInventory *m_containerScene;
@ -39,4 +39,4 @@ private:
float m_fScreenWidth,m_fScreenHeight;
float m_fRawWidth,m_fRawHeight;
};
};

6
Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSkinPreview.h
View file

@ -73,7 +73,7 @@ private:
bool bindTexture(const std::wstring& urlTexture, int backupTexture);
bool bindTexture(const std::wstring& urlTexture, const std::wstring& backupTexture);
BOOL m_bDirty;
bool m_bDirty;
float m_fScale,m_fAlpha;
std::wstring m_customTextureUrl;
@ -93,7 +93,7 @@ private:
float m_walkAnimPos;
bool m_bAutoRotate, m_bRotatingLeft;
BYTE m_rotateTick;
int m_rotateTick;
float m_fTargetRotation, m_fOriginalRotation;
int m_framesAnimatingRotation;
bool m_bAnimatingToFacing;
@ -103,4 +103,4 @@ private:
ESkinPreviewAnimations m_currentAnimation;
//std::vector<Model::SKIN_BOX *> *m_pvAdditionalBoxes;
std::vector<ModelPart *> *m_pvAdditionalModelParts;
};
};

8
Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_MinecraftSlot.h
View file

@ -39,9 +39,9 @@ protected:
private:
std::shared_ptr<ItemInstance> m_item;
BOOL m_bDirty;
INT m_iPassThroughDataAssociation;
INT m_iPassThroughIdAssociation;
bool m_bDirty;
int m_iPassThroughDataAssociation;
int m_iPassThroughIdAssociation;
float m_fScale,m_fAlpha;
int m_iPad;
int m_iID;
@ -56,4 +56,4 @@ private:
ItemRenderer *m_pItemRenderer;
static LPCWSTR xzpIcons[15];
};
};

6
Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SlotItemCtrlBase.h
View file

@ -24,7 +24,7 @@ class CXuiCtrlSlotItemCtrlBase
{
private:
// 4J WESTY : Pointer Prototype : Added to support prototype only.
BOOL m_bSkipDefaultNavigation;
bool m_bSkipDefaultNavigation;
public:
// We define a lot of functions as virtual. These should be implemented to call the protected version by
@ -56,7 +56,7 @@ public:
int GetObjectCount( HXUIOBJ hObj );
// 4J WESTY : Pointer Prototype : Added to support prototype only.
void SetSkipsDefaultNavigation( BOOL bSkipDefaultNavigation ) { m_bSkipDefaultNavigation = bSkipDefaultNavigation; }
void SetSkipsDefaultNavigation( bool bSkipDefaultNavigation ) { m_bSkipDefaultNavigation = bSkipDefaultNavigation; }
// 4J WESTY : Pointer Prototype : Added to support prototype only.
int GetEmptyStackSpace( HXUIOBJ hObj ); // Returns number of items that can still be stacked into this slot.
@ -75,4 +75,4 @@ protected:
HRESULT OnControlNavigate(HXUIOBJ hObj, XUIMessageControlNavigate *pControlNavigateData, BOOL& bHandled);
HRESULT OnKeyDown(HXUIOBJ hObj, XUIMessageInput *pInputData, BOOL& bHandled);
};
};

4
Minecraft.Client/Platform/Common/XUI/XUI_Ctrl_SplashPulser.h
View file

@ -27,10 +27,10 @@ protected:
HRESULT OnRender(XUIMessageRender *pRenderData, BOOL &rfHandled);
private:
BOOL m_bDirty;
bool m_bDirty;
float m_fScale,m_fAlpha;
float m_fScreenWidth,m_fScreenHeight;
float m_fRawWidth,m_fRawHeight;
};
};

2
Minecraft.Client/Platform/Common/XUI/XUI_CustomMessages.h
View file

@ -20,7 +20,7 @@ typedef struct
int iDataBitField;
int iItemBitField;
LPCWSTR szPath;
BOOL bDirty;
bool bDirty;
}
CustomMessage_GetSlotItem_Struct;