petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

Codechange: split widget_data into its actual components

Browse Source
This commit is contained in:
Rubidium
2025-01-02 13:33:24 +01:00
committed by rubidium42
parent df6e2d7aa4
commit 99d790c4bb
5 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/widget_type.h
View File

@@ -364,13 +364,22 @@ enum NWidgetDisplay {
};
DECLARE_ENUM_AS_BIT_SET(NWidgetDisplay)
/** Container with the data associated to a single widget. */
struct WidgetData {
StringID string{};
SpriteID sprite{};
ArrowWidgetValues arrow_widget_type{};
ResizeWidgetValues resize_widget_type{};
uint32_t matrix{};
};
/**
* Base class for a 'real' widget.
* @ingroup NestedWidgets
*/
class NWidgetCore : public NWidgetResizeBase {
public:
NWidgetCore(WidgetType tp, Colours colour, WidgetID index, uint fill_x, uint fill_y, uint32_t widget_data, StringID tool_tip);
NWidgetCore(WidgetType tp, Colours colour, WidgetID index, uint fill_x, uint fill_y, const WidgetData &widget_data, StringID tool_tip);
void SetString(StringID string);
void SetStringTip(StringID string, StringID tool_tip);
@@ -399,7 +408,7 @@ public:
NWidgetDisplay disp_flags; ///< Flags that affect display and interaction with the widget.
Colours colour; ///< Colour of this widget.
const WidgetID index; ///< Index of the nested widget (\c -1 means 'not used').
uint32_t widget_data; ///< Data of the widget. @see Widget::data
WidgetData widget_data; ///< Data of the widget. @see Widget::data
StringID tool_tip; ///< Tooltip of the widget. @see Widget::tootips
WidgetID scrollbar_index; ///< Index of an attached scrollbar.
TextColour highlight_colour; ///< Colour of highlight.
@@ -923,7 +932,7 @@ private:
*/
class NWidgetLeaf : public NWidgetCore {
public:
NWidgetLeaf(WidgetType tp, Colours colour, WidgetID index, uint32_t data, StringID tip);
NWidgetLeaf(WidgetType tp, Colours colour, WidgetID index, const WidgetData &data, StringID tip);
void SetupSmallestSize(Window *w) override;
void Draw(const Window *w) override;
@@ -1010,7 +1019,7 @@ inline uint ComputeMaxSize(uint base, uint max_space, uint step)
* @ingroup NestedWidgetParts
*/
struct NWidgetPartDataTip {
uint32_t data; ///< Data value of the widget.
WidgetData data; ///< Data value of the widget.
StringID tooltip; ///< Tooltip of the widget.
};
@@ -1209,7 +1218,7 @@ constexpr NWidgetPart EndContainer()
*/
constexpr NWidgetPart SetStringTip(StringID string, StringID tip = {})
{
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{string, tip}};
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{{.string = string}, tip}};
}
/**
@@ -1220,7 +1229,7 @@ constexpr NWidgetPart SetStringTip(StringID string, StringID tip = {})
*/
constexpr NWidgetPart SetSpriteTip(SpriteID sprite, StringID tip = {})
{
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{sprite, tip}};
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{{.sprite = sprite}, tip}};
}
/**
@@ -1231,7 +1240,7 @@ constexpr NWidgetPart SetSpriteTip(SpriteID sprite, StringID tip = {})
*/
constexpr NWidgetPart SetArrowWidgetTypeTip(ArrowWidgetValues widget_type, StringID tip = {})
{
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{widget_type, tip}};
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{{.arrow_widget_type = widget_type}, tip}};
}
/**
@@ -1242,7 +1251,7 @@ constexpr NWidgetPart SetArrowWidgetTypeTip(ArrowWidgetValues widget_type, Strin
*/
constexpr NWidgetPart SetResizeWidgetTypeTip(ResizeWidgetValues widget_type, StringID tip)
{
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{widget_type, tip}};
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{{.resize_widget_type = widget_type}, tip}};
}
/**
@@ -1254,7 +1263,7 @@ constexpr NWidgetPart SetResizeWidgetTypeTip(ResizeWidgetValues widget_type, Str
*/
constexpr NWidgetPart SetMatrixDataTip(uint8_t cols, uint8_t rows, StringID tip = {})
{
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{static_cast<uint32_t>((rows << MAT_ROW_START) | (cols << MAT_COL_START)), tip}};
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{{.matrix = static_cast<uint32_t>((rows << MAT_ROW_START) | (cols << MAT_COL_START))}, tip}};
}
/**
@@ -1264,7 +1273,7 @@ constexpr NWidgetPart SetMatrixDataTip(uint8_t cols, uint8_t rows, StringID tip
*/
constexpr NWidgetPart SetToolTip(StringID tip)
{
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{0x0, tip}};
return NWidgetPart{WPT_DATATIP, NWidgetPartDataTip{{}, tip}};
}
/**