Merge remote-tracking branch 'upstream/master'

This commit is contained in:
dP
2025-05-14 18:41:13 +05:00
994 changed files with 38759 additions and 34518 deletions

View File

@@ -25,12 +25,12 @@
TransparencyOptionBits _transparency_opt; ///< The bits that should be transparent.
TransparencyOptionBits _transparency_lock; ///< Prevent these bits from flipping with X.
TransparencyOptionBits _invisibility_opt; ///< The bits that should be invisible.
byte _display_opt; ///< What do we want to draw/do?
uint8_t _display_opt; ///< What do we want to draw/do?
class TransparenciesWindow : public Window
{
public:
TransparenciesWindow(WindowDesc *desc, int window_number) : Window(desc)
TransparenciesWindow(WindowDesc &desc, int window_number) : Window(desc)
{
this->InitNested(window_number);
}
@@ -150,11 +150,11 @@ static constexpr NWidgetPart _nested_transparency_widgets[] = {
EndContainer(),
};
static WindowDesc _transparency_desc(__FILE__, __LINE__,
static WindowDesc _transparency_desc(
WDP_MANUAL, "toolbar_transparency", 0, 0,
WC_TRANSPARENCY_TOOLBAR, WC_NONE,
0,
std::begin(_nested_transparency_widgets), std::end(_nested_transparency_widgets)
_nested_transparency_widgets
);
/**
@@ -162,5 +162,5 @@ static WindowDesc _transparency_desc(__FILE__, __LINE__,
*/
void ShowTransparencyToolbar()
{
AllocateWindowDescFront<TransparenciesWindow>(&_transparency_desc, 0);
AllocateWindowDescFront<TransparenciesWindow>(_transparency_desc, 0);
}