From c3dfac7ade1b247b0378491d93d55ff6ac883f01 Mon Sep 17 00:00:00 2001 From: Ivaylo Draganov Date: Tue, 5 Oct 2021 20:50:40 +0300 Subject: [PATCH] Remove redundant default hotkey UI notice --- .../Widgets/Logic/Settings/HotkeysSettingsLogic.cs | 4 ---- mods/cnc/chrome/settings-hotkeys.yaml | 5 ----- mods/common/chrome/settings-hotkeys.yaml | 5 ----- mods/ts/chrome/settings-hotkeys.yaml | 5 ----- 4 files changed, 19 deletions(-) diff --git a/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs b/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs index e63c05feea..eb4687f764 100644 --- a/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs +++ b/OpenRA.Mods.Common/Widgets/Logic/Settings/HotkeysSettingsLogic.cs @@ -155,10 +155,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic var duplicateNoticeText = new CachedTransform(hd => hd != null ? duplicateNotice.Text.F(hd.Description) : duplicateNotice.Text); duplicateNotice.GetText = () => duplicateNoticeText.Update(duplicateHotkeyDefinition); - var defaultNotice = panel.Get("DEFAULT_NOTICE"); - defaultNotice.TextColor = ChromeMetrics.Get("NoticeInfoColor"); - defaultNotice.IsVisible = () => isHotkeyValid && isHotkeyDefault; - var originalNotice = panel.Get("ORIGINAL_NOTICE"); originalNotice.TextColor = ChromeMetrics.Get("NoticeInfoColor"); originalNotice.IsVisible = () => isHotkeyValid && !isHotkeyDefault; diff --git a/mods/cnc/chrome/settings-hotkeys.yaml b/mods/cnc/chrome/settings-hotkeys.yaml index e304aca69a..b91d4ec788 100644 --- a/mods/cnc/chrome/settings-hotkeys.yaml +++ b/mods/cnc/chrome/settings-hotkeys.yaml @@ -80,11 +80,6 @@ Container@HOTKEYS_PANEL: Width: 220 Height: 25 Children: - Label@DEFAULT_NOTICE: - Width: PARENT_RIGHT - Height: PARENT_BOTTOM - Font: Tiny - Text: This is the default Label@ORIGINAL_NOTICE: Width: PARENT_RIGHT Height: PARENT_BOTTOM diff --git a/mods/common/chrome/settings-hotkeys.yaml b/mods/common/chrome/settings-hotkeys.yaml index 537de1e3a5..84eb882de1 100644 --- a/mods/common/chrome/settings-hotkeys.yaml +++ b/mods/common/chrome/settings-hotkeys.yaml @@ -80,11 +80,6 @@ Container@HOTKEYS_PANEL: Width: 300 Height: 25 Children: - Label@DEFAULT_NOTICE: - Width: PARENT_RIGHT - Height: PARENT_BOTTOM - Font: Tiny - Text: This is the default Label@ORIGINAL_NOTICE: Width: PARENT_RIGHT Height: PARENT_BOTTOM diff --git a/mods/ts/chrome/settings-hotkeys.yaml b/mods/ts/chrome/settings-hotkeys.yaml index 5e7cf95912..1731311445 100644 --- a/mods/ts/chrome/settings-hotkeys.yaml +++ b/mods/ts/chrome/settings-hotkeys.yaml @@ -82,11 +82,6 @@ Container@HOTKEYS_PANEL: Width: 300 Height: 25 Children: - Label@DEFAULT_NOTICE: - Width: PARENT_RIGHT - Height: PARENT_BOTTOM - Font: Tiny - Text: This is the default Label@ORIGINAL_NOTICE: Width: PARENT_RIGHT Height: PARENT_BOTTOM