mirror of https://github.com/OpenRCT2/OpenRCT2.git
Use GetColourButtonImage() for remaining windows
This commit is contained in:
parent
89cd86da4d
commit
418c5a6708
|
@ -288,7 +288,7 @@ public:
|
|||
disabled_widgets |= (1ULL << WIDX_BANNER_TEXT) | (1ULL << WIDX_TEXT_COLOUR_DROPDOWN)
|
||||
| (1ULL << WIDX_TEXT_COLOUR_DROPDOWN_BUTTON);
|
||||
}
|
||||
colourBtn->image = SPRITE_ID_PALETTE_COLOUR_1(banner->colour) | IMAGE_TYPE_TRANSPARENT | SPR_PALETTE_BTN;
|
||||
colourBtn->image = GetColourButtonImage(banner->colour).ToUInt32();
|
||||
rct_widget* dropDownWidget = &window_banner_widgets[WIDX_TEXT_COLOUR_DROPDOWN];
|
||||
dropDownWidget->text = BannerColouredTextFormats[banner->text_colour];
|
||||
}
|
||||
|
|
|
@ -456,7 +456,7 @@ void WindowDropdownShowColour(rct_window* w, rct_widget* widget, uint8_t dropdow
|
|||
defaultIndex = i;
|
||||
|
||||
gDropdownItems[i].Format = Dropdown::FormatColourPicker;
|
||||
gDropdownItems[i].Args = (i << 32) | (SPRITE_ID_PALETTE_COLOUR_1(i) | SPR_PALETTE_BTN);
|
||||
gDropdownItems[i].Args = (i << 32) | ImageId(SPR_PALETTE_BTN, i).ToUInt32();
|
||||
}
|
||||
|
||||
// Show dropdown
|
||||
|
|
|
@ -542,12 +542,9 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].image = SPRITE_ID_PALETTE_COLOUR_1(gWindowSceneryPrimaryColour)
|
||||
| IMAGE_TYPE_TRANSPARENT | SPR_PALETTE_BTN;
|
||||
widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].image = SPRITE_ID_PALETTE_COLOUR_1(gWindowScenerySecondaryColour)
|
||||
| IMAGE_TYPE_TRANSPARENT | SPR_PALETTE_BTN;
|
||||
widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].image = SPRITE_ID_PALETTE_COLOUR_1(gWindowSceneryTertiaryColour)
|
||||
| IMAGE_TYPE_TRANSPARENT | SPR_PALETTE_BTN;
|
||||
widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].image = GetColourButtonImage(gWindowSceneryPrimaryColour).ToUInt32();
|
||||
widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].image = GetColourButtonImage(gWindowScenerySecondaryColour).ToUInt32();
|
||||
widgets[WIDX_SCENERY_TERTIARY_COLOUR_BUTTON].image = GetColourButtonImage(gWindowSceneryTertiaryColour).ToUInt32();
|
||||
|
||||
widgets[WIDX_SCENERY_PRIMARY_COLOUR_BUTTON].type = WindowWidgetType::Empty;
|
||||
widgets[WIDX_SCENERY_SECONDARY_COLOUR_BUTTON].type = WindowWidgetType::Empty;
|
||||
|
|
|
@ -275,8 +275,8 @@ public:
|
|||
}
|
||||
}
|
||||
|
||||
main_colour_btn->image = SPRITE_ID_PALETTE_COLOUR_1(_mainColour) | IMAGE_TYPE_TRANSPARENT | SPR_PALETTE_BTN;
|
||||
text_colour_btn->image = SPRITE_ID_PALETTE_COLOUR_1(_textColour) | IMAGE_TYPE_TRANSPARENT | SPR_PALETTE_BTN;
|
||||
main_colour_btn->image = GetColourButtonImage(_mainColour).ToUInt32();
|
||||
text_colour_btn->image = GetColourButtonImage(_textColour).ToUInt32();
|
||||
}
|
||||
|
||||
void OnDraw(rct_drawpixelinfo& dpi) override
|
||||
|
|
|
@ -252,8 +252,9 @@ public:
|
|||
if (GetSelectedStaffType() != StaffType::Entertainer)
|
||||
{
|
||||
widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].type = WindowWidgetType::ColourBtn;
|
||||
auto spriteIdPalette = SPRITE_ID_PALETTE_COLOUR_1(static_cast<uint32_t>(staff_get_colour(GetSelectedStaffType())));
|
||||
widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].image = spriteIdPalette | IMAGE_TYPE_TRANSPARENT | SPR_PALETTE_BTN;
|
||||
widgets[WIDX_STAFF_LIST_UNIFORM_COLOUR_PICKER].image = GetColourButtonImage(
|
||||
staff_get_colour(GetSelectedStaffType()))
|
||||
.ToUInt32();
|
||||
}
|
||||
SetWidgetPressed(WIDX_STAFF_LIST_QUICK_FIRE, _quickFireMode);
|
||||
|
||||
|
|
Loading…
Reference in New Issue