From fa08ff291bf4212b2c3f9f83fe770ac9854c7f8d Mon Sep 17 00:00:00 2001 From: Iris Morelle Date: Mon, 27 Jul 2020 06:00:32 -0400 Subject: [PATCH] gui2/button: Fix highlight colour for the disabled state It was apparently copy-pasted from the pressed state. This resulted in disabled buttons looking like they are pressed. [ci skip] --- changelog.md | 1 + data/gui/widget/button_default.cfg | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index dbd55f80db6a..3b2cfe4ba932 100644 --- a/changelog.md +++ b/changelog.md @@ -535,6 +535,7 @@ ### User interface * Do not list nameless abilities in the Abilities and Ability Upgrades lists in unit descriptions in Help (issue #3060). + * Fixed disabled buttons using the pressed highlight color. ### Miscellaneous and bug fixes * Made wmllint recognize [remove_time_area] in order to avoid spurious warnings about unit ids. diff --git a/data/gui/widget/button_default.cfg b/data/gui/widget/button_default.cfg index 487c26f1ebf9..235361488240 100644 --- a/data/gui/widget/button_default.cfg +++ b/data/gui/widget/button_default.cfg @@ -111,7 +111,7 @@ {_GUI_STATE "background" ({GUI__FONT_COLOR_DISABLED__DEFAULT ALPHA={ALPHA}}) ("89, 89, 89, {ALPHA}") - ("1, 10, 16, 255") "~GS(){IPF}"} + ("60, 60, 60, 255") "~GS(){IPF}"} {GUI__CENTERED_TEXT ({FONT_SIZE}) () ({GUI__FONT_COLOR_DISABLED__TITLE})}