Add Statistics options hotkeys #13781

rob-v · 2017-08-06T11:45:52Z

Closes #13743
New hotkeys for Statistics dialog:

pchote · 2017-08-06T11:48:50Z

#13706 and #13711 rework the way hotkeys are defined and used. Can you please update this to use the new system?

rob-v · 2017-08-06T13:12:26Z

Updated to use new hotkeys design.

pchote · 2017-08-06T13:18:54Z

OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs

+			if (e.Event == KeyInputEvent.Down && !e.IsRepeat)
+			{
+				var h = Hotkey.FromKeyInput(e);
+				if (h == Game.Settings.Keys.StatisticsBasicKey)


These need to be pulled from the chrome logic args (see 12c5d05#diff-9c03e754ef92a76206eb1b2c35d8dfaeR68) because these hardcoded Game.Settings.Keys.* fields are all going away -- this is the key part of the hotkey rework.

sorry, I pushed only rebased stuff, forgot to commit staged changes. I don't use Keys.StatisticsBasicKey,... anymore.

rob-v · 2017-08-06T13:27:40Z

Updated again, pushed only rebased stuff before. Now pushed also with adaptations for new hotkey design.

pchote · 2017-08-06T13:32:12Z

Note for reviewing: ddfb601?w=1 is the meat of this PR, ignoring the whitespace and my prereq changes.

The code changes look good, but I haven't yet reviewed the behavior or choice of keys.

netnazgul · 2017-09-03T10:10:32Z

@rob-v can this be prepped for Next+1?

pchote · 2017-09-03T10:17:46Z

OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs

+			if (e.Event == KeyInputEvent.Down && !e.IsRepeat)
+			{
+				var h = Hotkey.FromKeyInput(e);
+				if (h == statisticsBasicKey.GetValue())


If you put these keys in an array then you could reduce duplication by looping over them. Compare with #13966.

rob-v · 2017-09-04T11:56:43Z

Updated with hotkeys array as suggested.

pchote · 2017-09-16T10:11:10Z

Sorry, but this needs a rebase to avoid another #14028 situation.

pchote

Looks good overall, just two minor points (of which one is my fault) and a scope creep:

This feature would be much more useful if the tab hotkeys worked directly from the world without opening the panel first. It shouldn't be too hard to adapt:

OpenRA/OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs

Lines 84 to 89 in d99a472

    
           var stats = widget.GetOrNull<MenuButtonWidget>("OBSERVER_STATS_BUTTON"); 
        
           if (stats != null) 
        
           { 
        
           	stats.IsDisabled = () => disableSystemButtons || world.Map.Visibility.HasFlag(MapVisibility.MissionSelector); 
        
           	stats.OnClick = () => OpenMenuPanel(stats); 
        
           }

to open from any of the keys by following the approach of:

OpenRA/OpenRA.Mods.Common/Widgets/Logic/Ingame/CommandBarLogic.cs

Lines 205 to 220 in d99a472

    
           var keyOverrides = widget.GetOrNull<LogicKeyListenerWidget>("MODIFIER_OVERRIDES"); 
        
           if (keyOverrides != null) 
        
           { 
        
           	keyOverrides.AddHandler(e => 
        
           	{ 
        
           		// HACK: enable attack move to be triggered if the ctrl key is pressed 
        
           		var modified = new Hotkey(e.Key, e.Modifiers & ~Modifiers.Ctrl); 
        
           		if (attackMoveButton.Key.GetValue() == modified) 
        
           		{ 
        
           			attackMoveButton.OnKeyPress(e); 
        
           			return true; 
        
           		} 
        
           		return false; 
        
           	}); 
        
           }

pchote · 2017-09-16T10:13:01Z

OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs

@@ -146,6 +118,9 @@ public ObserverStatsLogic(World world, WorldRenderer worldRenderer, Widget widge
 					Ui.Root.RemoveChild(widget);
 					onExit();
 				};
+
+			var keyhandler = statsDropDown.Get<LogicKeyListenerWidget>("STATS_DROPDOWN_KEYHANDLER");
+			keyhandler.OnKeyPress = HandleKeyPress;


This needs to change to keyhandler.AddHandler(HandleKeyPress);

pchote · 2017-09-16T10:17:02Z

OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs

@@ -501,7 +501,12 @@ Action InitInputPanel(Widget panel)
 					{ "ReplaySpeedSlowKey", "Slow speed" },
 					{ "ReplaySpeedRegularKey", "Regular speed" },
 					{ "ReplaySpeedFastKey", "Fast speed" },
-					{ "ReplaySpeedMaxKey", "Maximum speed" }
+					{ "ReplaySpeedMaxKey", "Maximum speed" },
+					{ "StatisticsBasicKey", "Statistics Basic" },


Can we please change these to "Basic Statistics tab" and so on, so they read as proper english?

rob-v · 2017-09-16T15:03:15Z

Updated.

pchote · 2017-09-16T15:15:50Z

OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs

+					{
+						var ks = Game.Settings.Keys;
+						var key = new Hotkey(e.Key, e.Modifiers);
+						Hotkey[] statsKeys = { ks.StatisticsBasicKey, ks.StatisticsEconomyKey, ks.StatisticsProductionKey, ks.StatisticsCombatKey, ks.StatisticsGraphKey };


Can you please use NamedHotkey instead? These hardcoded ks.* fields are about to move to yaml.

I am not sure how to do it.

move Statistics<name>Key from ObserverStatsLogic to MenuButtonsChromeLogic and then pass them to ObserverStatsLogic

use ObserverStatsLogic.StatsHotkeys in MenuButtonsChromeLogic. Trying to find now how to get reference to this Logic object in MenuButtonsChromeLogic

?

Hmm, good question. I think the best approach here will be to define/accept the same Statistics*Key args in MenuButtonsChromeLogic that you use in ObserverStatsLogic -- define them in both places rather than reference or try to pass them between classes.

rob-v · 2017-09-17T07:34:18Z

Updated.

pchote

Looks good, thanks. Just two more minor nits, and then can you also change the OBSERVER_STATS_BUTTON Key:'s to use StatisticsBasic instead of hardcoding F1?

pchote · 2017-09-17T07:47:35Z

OpenRA.Mods.Common/Widgets/Logic/Ingame/MenuButtonsChromeLogic.cs

 			}
+
+			var keyListener = widget.GetOrNull<LogicKeyListenerWidget>("OBSERVER_KEY_LISTENER");
+			if (keyListener != null)


Style nit: if a single statement includes its own inner blocks, then the outer block should have braces to avoid ambiguity.

pchote · 2017-09-17T07:51:03Z

OpenRA.Mods.Common/Widgets/Logic/Ingame/ObserverStatsLogic.cs

+		readonly IEnumerable<Player> players;
+		readonly World world;
+		readonly WorldRenderer worldRenderer;
+		readonly List<StatsDropDownOption> statsDropDownOptions;


This can be an array instead of a list.

rob-v · 2017-09-17T08:19:02Z

Updated. All good ideas. Now much more useful to use hotkeys ingame to open directly a stats tab, though it is little annoying (discouraging to use) that it takes second(s) (since latest playtests) to open a/Stats dialog.

Re OBSERVER_STATS_BUTTON's Key - I removed it, as StatisticsBasicKey already works without this now. Is it ok or you prefer to keep it?

pchote · 2017-09-17T08:20:16Z

though it is little annoying (discouraging to use) that it takes second(s) (since latest playtests) to open a/Stats dialog.

What do you mean? Is this a recent regression?

Re OBSERVER_STATS_BUTTON's Key - I removed it, as StatisticsBasicKey already works without this now. Is it ok or you prefer to keep it?

Keep it please so that it will show the hotkey in the tooltip.

rob-v · 2017-09-17T08:27:17Z

Updated.
I assumed it is well known, but didn't see more comments about this... #13526
Right, tooltip.

pchote

Sorry, a couple more and hopefully final set of polish issues:

pchote · 2017-09-17T08:52:10Z

OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs

+					{ "StatisticsEconomyKey", "Economy Statistics" },
+					{ "StatisticsProductionKey", "Production Statistics" },
+					{ "StatisticsCombatKey", "Combat Statistics" },
+					{ "StatisticsGraphKey", "Graph Statistics" }


"Graph Statistics" doesn't make sense. Can you please change this to "Economy Graph" or "Statistics Graph"?

pchote · 2017-09-17T08:56:11Z

OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs

@@ -502,7 +502,12 @@ Action InitInputPanel(Widget panel)
 					{ "ReplaySpeedSlowKey", "Slow speed" },
 					{ "ReplaySpeedRegularKey", "Regular speed" },
 					{ "ReplaySpeedFastKey", "Fast speed" },
-					{ "ReplaySpeedMaxKey", "Maximum speed" }
+					{ "ReplaySpeedMaxKey", "Maximum speed" },
+					{ "StatisticsBasicKey", "Basic Statistics" },


Please use lower case "s" for consistency with (most of) the other definitions.
Don't worry about the other ones (e.g. "All Players"), I'll fix those in the pr that pulls these out to the yaml.

pchote · 2017-09-17T08:57:25Z

mods/ts/chrome/ingame-observer.yaml

@@ -18,7 +25,6 @@ Container@OBSERVER_WIDGETS:
 			Height: 25
 			Text: Statistics (F1)


Can you please remove the "(F1)" from here too?

rob-v · 2017-09-17T09:21:12Z

Updated.

reaperrr · 2017-09-24T13:33:31Z

https://github.com/OpenRA/OpenRA/wiki/Changelog-(bleed)/_compare/b5db0048bc8a49426dc39bae8209705b4d4d7778...d8db0ddb0ba698381017eb69ce789edbe94cdc55

netnazgul · 2017-10-16T20:16:51Z

Hm, so this was merged 3 weeks ago but didn't get into release?

pchote · 2017-10-16T20:17:51Z

This was merged to bleed, not prep.

netnazgul · 2017-10-17T05:33:32Z

yes, @abcdefg30 already explained it in discord. So it will be re-checked for the future playtests, right?

I suppose there is a list of bleed PRs that you go through before proceeding with bug-clearing the coming release?

abcdefg30 · 2017-10-17T09:09:11Z

This PR, the same as all other PRs merged into bleed until a new prep branch is split off, go into the next playtest, yes.

pchote added the PR: Has dependencies label Aug 6, 2017

rob-v mentioned this pull request Aug 6, 2017

Expand statistics control for spectators #13743

Closed

pchote reviewed Aug 6, 2017

View reviewed changes

pchote removed the PR: Has dependencies label Sep 3, 2017

pchote reviewed Sep 3, 2017

View reviewed changes

pchote mentioned this pull request Sep 10, 2017

Add "Assault Move" modifier to attack move #14010

Merged

pchote added the PR: Is Dependency label Sep 16, 2017

pchote added the PR: Rebase me! label Sep 16, 2017

pchote reviewed Sep 16, 2017

View reviewed changes

pchote reviewed Sep 17, 2017

View reviewed changes

pchote added PR: Fixup requested PR: Needs +2 and removed PR: Rebase me! labels Sep 17, 2017

pchote reviewed Sep 17, 2017

View reviewed changes

Add Statistics options hotkeys

dfb7f8d

pchote approved these changes Sep 17, 2017

View reviewed changes

pchote removed the PR: Fixup requested label Sep 17, 2017

reaperrr approved these changes Sep 24, 2017

View reviewed changes

reaperrr merged commit c9b4568 into OpenRA:bleed Sep 24, 2017

rob-v deleted the AddStatisticTabsHotkeys branch October 18, 2017 21:26

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Statistics options hotkeys #13781

Add Statistics options hotkeys #13781

rob-v commented Aug 6, 2017

pchote commented Aug 6, 2017 •

edited

Loading

rob-v commented Aug 6, 2017

pchote Aug 6, 2017 •

edited

Loading

rob-v Aug 6, 2017 •

edited

Loading

rob-v commented Aug 6, 2017

pchote commented Aug 6, 2017 •

edited

Loading

netnazgul commented Sep 3, 2017

pchote Sep 3, 2017

rob-v commented Sep 4, 2017

pchote commented Sep 16, 2017

pchote left a comment

pchote Sep 16, 2017

pchote Sep 16, 2017

rob-v commented Sep 16, 2017

pchote Sep 16, 2017

rob-v Sep 16, 2017 •

edited

Loading

pchote Sep 16, 2017

rob-v commented Sep 17, 2017

pchote left a comment

pchote Sep 17, 2017

pchote Sep 17, 2017

rob-v commented Sep 17, 2017

pchote commented Sep 17, 2017

rob-v commented Sep 17, 2017

pchote left a comment

pchote Sep 17, 2017

pchote Sep 17, 2017

pchote Sep 17, 2017

rob-v commented Sep 17, 2017

reaperrr commented Sep 24, 2017

netnazgul commented Oct 16, 2017

pchote commented Oct 16, 2017

netnazgul commented Oct 17, 2017 •

edited

Loading

abcdefg30 commented Oct 17, 2017

	var stats = widget.GetOrNull<MenuButtonWidget>("OBSERVER_STATS_BUTTON");
	if (stats != null)
	{
	stats.IsDisabled = () => disableSystemButtons \|\| world.Map.Visibility.HasFlag(MapVisibility.MissionSelector);
	stats.OnClick = () => OpenMenuPanel(stats);
	}

	var keyOverrides = widget.GetOrNull<LogicKeyListenerWidget>("MODIFIER_OVERRIDES");
	if (keyOverrides != null)
	{
	keyOverrides.AddHandler(e =>
	{
	// HACK: enable attack move to be triggered if the ctrl key is pressed
	var modified = new Hotkey(e.Key, e.Modifiers & ~Modifiers.Ctrl);
	if (attackMoveButton.Key.GetValue() == modified)
	{
	attackMoveButton.OnKeyPress(e);
	return true;
	}

	return false;
	});
	}

		@@ -18,7 +25,6 @@ Container@OBSERVER_WIDGETS:
		Height: 25
		Text: Statistics (F1)

Add Statistics options hotkeys #13781

Add Statistics options hotkeys #13781

Conversation

rob-v commented Aug 6, 2017

pchote commented Aug 6, 2017 • edited Loading

rob-v commented Aug 6, 2017

pchote Aug 6, 2017 • edited Loading

Choose a reason for hiding this comment

rob-v Aug 6, 2017 • edited Loading

Choose a reason for hiding this comment

rob-v commented Aug 6, 2017

pchote commented Aug 6, 2017 • edited Loading

netnazgul commented Sep 3, 2017

Choose a reason for hiding this comment

rob-v commented Sep 4, 2017

pchote commented Sep 16, 2017

pchote left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rob-v commented Sep 16, 2017

Choose a reason for hiding this comment

rob-v Sep 16, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rob-v commented Sep 17, 2017

pchote left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rob-v commented Sep 17, 2017

pchote commented Sep 17, 2017

rob-v commented Sep 17, 2017

pchote left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rob-v commented Sep 17, 2017

reaperrr commented Sep 24, 2017

netnazgul commented Oct 16, 2017

pchote commented Oct 16, 2017

netnazgul commented Oct 17, 2017 • edited Loading

abcdefg30 commented Oct 17, 2017

pchote commented Aug 6, 2017 •

edited

Loading

pchote Aug 6, 2017 •

edited

Loading

rob-v Aug 6, 2017 •

edited

Loading

pchote commented Aug 6, 2017 •

edited

Loading

rob-v Sep 16, 2017 •

edited

Loading

netnazgul commented Oct 17, 2017 •

edited

Loading