Fix the miscellaneous tab not showing proper values after rP24721.
I guess it is either this or a revert. I don't like the fact that we filter here, I think we should do it earlier, if one has hideInSummary true for the counter, but not for the heading things get ugly again.
Details
- Reviewers
wraitii - Group Reviewers
Restricted Owners Package (Owns No Changed Paths) - Commits
- rP24754: Fix values of miscellaneous summary tab shifted.
- Trac Tickets
- #5946
Select the Miscellaneous tab with and without this patch. Same with a team game.
Diff Detail
- Repository
- rP 0 A.D. Public Repository
- Branch
- /ps/trunk
- Lint
Lint OK - Unit
No Unit Test Coverage - Build Status
Buildable 15310 Build 33348: Vulcan Build Jenkins Build 33347: Vulcan Build (macOS) Jenkins Build 33346: Vulcan Build (Windows) Jenkins Build 33345: arc lint + arc unit
Time | Test | |
---|---|---|
0 ms | Jenkins > TestPreprocessor::test_include_double Error: Expected (result.output.Trim(PS_TRIM_BOTH) == "#line 1\n42\n#line 3\n#line 1\n42\n#line 4\n#line 1\n42\n#line 5"), found ("" != #line 1
42
#line 3
| |
0 ms | Jenkins > TestAllocators::Debug: Test / test_da | |
0 ms | Jenkins > TestAllocators::Release: Test / test_da | |
0 ms | Jenkins > TestAllocators::test_da | |
0 ms | Jenkins > TestAllocators::test_da | |
View Full Test Results (1 Failed · 1,757 Passed) |
Event Timeline
Build has FAILED
builderr-debug-macos.txt ../../../source/graphics/ShaderProgram.cpp:86:15: warning: 'Reload' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] virtual void Reload() ^ ../../../source/graphics/ShaderProgram.h:124:15: note: overridden virtual function is here virtual void Reload() = 0; ^ ../../../source/graphics/ShaderProgram.cpp:118:15: warning: 'Bind' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] virtual void Bind() ^ ../../../source/graphics/ShaderProgram.h:135:15: note: overridden virtual function is here virtual void Bind() = 0; ^ ../../../source/graphics/ShaderProgram.cpp:128:15: warning: 'Unbind' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] virtual void Unbind() ^ ../../../source/graphics/ShaderProgram.h:140:
Link to build: https://jenkins.wildfiregames.com/job/macos-differential/3000/display/redirect
See console output for more information: https://jenkins.wildfiregames.com/job/macos-differential/3000/display/redirectconsole
"I guess it is either this or a revert. I don't like the fact that we filter here, I think we should do it earlier, if one has hideInSummary true for the counter, but not for the heading things get ugly again."
That's without the hideInSummary variable already true. If headings and counters contained different number of values it would be ugly (independent of rP24721). It's the disconnection between headings and counters that feels weird. I think in long term the getScorePanelsData should return something like:
[ { "label": ... "titleHeadings": ... "values": [ { "identifier": "total", "caption": translate("Total"), "yStart": 34, "width": 105, "verticalOffset": 3, "fn": calculateBuildings "hideInSummary": false }, ... ], "teamCounterFn": calculateBuildingsTeam }, ... ]
I think the summary needs a general rewrite anyways. IMO not a big deal, performance doesn't matter here.
Yeah, could make sense. If you want to give it a shot, feel free to try it. (Won't get into A24 ofc ;)
@wraitii what kind of rewrite do you think of?