From 4bcef8e725f2a0d23180220e5ff3b896a3725f6a Mon Sep 17 00:00:00 2001
From: Ryan Liptak <squeek502@hotmail.com>
Date: Mon, 24 Aug 2020 11:51:29 -0700
Subject: [PATCH] Add button to toggle sortedness of the statistics screen
 (#590)

---
 res/ui/icons/display_sorted.png     | Bin 0 -> 430 bytes
 src/css/ingame_hud/statistics.scss  |   9 ++++++++-
 src/js/game/hud/parts/statistics.js |  26 +++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 res/ui/icons/display_sorted.png

diff --git a/res/ui/icons/display_sorted.png b/res/ui/icons/display_sorted.png
new file mode 100644
index 0000000000000000000000000000000000000000..2e3c2badb1ace3c95cae38373ebf33fe2f91b325
GIT binary patch
literal 430
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!TmyVUT!Hj|ib2ra;zK}##7ctv
zf*JlMM*R>?|NP-%aA#}N)pHZP6a<gd&2xT~%D}+L<muuV5^?zLwbOYm1|rQ54OEyP
z8ePBk{{M=p0;`zAg0J2__WI9#u9pH?-rjwN>osT0cFU1g-~4{V`pqpSkE)Z68bptZ
zF`rPKz^gFL!GuBPS_7NO0!H2+=?=5<ZJu(;%)9$c<*(|eDd7!u2evJ=|7z?1b173y
z{jMMDd6z9<_+9I))hH?8$ndS|qp?ds!``?*9g`IrzDTfGa4=2T%T(S`z_jG}UKX(x
z4TqN;U;byJXW-o*d{5`?-xL17^52x*`@h--bEWwoe5<*`mUa8`2j4{Q%xk(GTu{xG
zhbDMG_`*H$b&bU>?geH?ZQoye@b<3+!;${*6>qp-F;?lxuUTdY3@-*xS3j3^P6<r_
Ddn@5I

literal 0
HcmV?d00001

diff --git a/src/css/ingame_hud/statistics.scss b/src/css/ingame_hud/statistics.scss
index e53a80d1..d98d82c2 100644
--- a/src/css/ingame_hud/statistics.scss
+++ b/src/css/ingame_hud/statistics.scss
@@ -22,12 +22,18 @@
             @include S(margin-left, 1px);
 
             &.displayIcons,
-            &.displayDetailed {
+            &.displayDetailed,
+            &.displaySorted {
                 background: uiResource("icons/display_list.png") center center / #{D(15px)} no-repeat;
                 &.displayIcons {
                     background-image: uiResource("icons/display_icons.png");
                     background-size: #{D(11.5px)};
                 }
+                &.displaySorted {
+                    background-image: uiResource("icons/display_sorted.png");
+                    background-size: #{D(11.5px)};
+                    margin-right: 20px;
+                }
             }
 
             background-color: #44484a !important;
@@ -109,6 +115,7 @@
     .dialogInner {
         &[data-displaymode="detailed"] .displayDetailed,
         &[data-displaymode="icons"] .displayIcons,
+        &[data-sorted="true"] .displaySorted,
         &[data-datasource="produced"] .modeProduced,
         &[data-datasource="delivered"] .modeDelivered,
         &[data-datasource="stored"] .modeStored {
diff --git a/src/js/game/hud/parts/statistics.js b/src/js/game/hud/parts/statistics.js
index e15af4fb..ad8a68d1 100644
--- a/src/js/game/hud/parts/statistics.js
+++ b/src/js/game/hud/parts/statistics.js
@@ -47,9 +47,11 @@ export class HUDStatistics extends BaseHUDPart {
             this.trackClicks(button, () => this.setDataSource(dataSource));
         }
 
+        const buttonDisplaySorted = makeButton(this.filtersDisplayMode, ["displaySorted"]);
         const buttonDisplayDetailed = makeButton(this.filtersDisplayMode, ["displayDetailed"]);
         const buttonDisplayIcons = makeButton(this.filtersDisplayMode, ["displayIcons"]);
 
+        this.trackClicks(buttonDisplaySorted, () => this.toggleSorted());
         this.trackClicks(buttonDisplayIcons, () => this.setDisplayMode(enumDisplayMode.icons));
         this.trackClicks(buttonDisplayDetailed, () => this.setDisplayMode(enumDisplayMode.detailed));
 
@@ -80,6 +82,21 @@ export class HUDStatistics extends BaseHUDPart {
         }
     }
 
+    /**
+     * @param {boolean} sorted
+     */
+    setSorted(sorted) {
+        this.sorted = sorted;
+        this.dialogInner.setAttribute("data-sorted", sorted);
+        if (this.visible) {
+            this.rerenderFull();
+        }
+    }
+
+    toggleSorted() {
+        this.setSorted(!this.sorted);
+    }
+
     initialize() {
         this.domAttach = new DynamicDomAttach(this.root, this.background, {
             attachClass: "visible",
@@ -95,6 +112,7 @@ export class HUDStatistics extends BaseHUDPart {
         /** @type {Object.<string, HUDShapeStatisticsHandle>} */
         this.activeHandles = {};
 
+        this.setSorted(true);
         this.setDataSource(enumAnalyticsDataSource.produced);
         this.setDisplayMode(enumDisplayMode.detailed);
 
@@ -183,7 +201,13 @@ export class HUDStatistics extends BaseHUDPart {
             }
         }
 
-        entries.sort((a, b) => b[1] - a[1]);
+        entries.sort((a, b) => {
+            // Sort by shape key for some consistency
+            if (!this.sorted || b[1] == a[1]) {
+                return b[0].localeCompare(a[0]);
+            }
+            return b[1] - a[1];
+        });
 
         let rendered = new Set();