From af0bf99f65ebe54d488ee80fcd6f48586365ef89 Mon Sep 17 00:00:00 2001
From: Cyberarm <matthewlikesrobots@gmail.com>
Date: Mon, 22 Nov 2021 22:23:59 -0600
Subject: [PATCH] Render lock icon onto passworded servers game icon

---
 lib/pages/server_browser.rb |  22 ++++++++++++++++++----
 media/ui_icons/locked.png   | Bin 0 -> 15262 bytes
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 media/ui_icons/locked.png

diff --git a/lib/pages/server_browser.rb b/lib/pages/server_browser.rb
index 3699aaf..84145d4 100644
--- a/lib/pages/server_browser.rb
+++ b/lib/pages/server_browser.rb
@@ -2,8 +2,11 @@ class W3DHub
   class Pages
     class ServerBrowser < Page
       def setup
+        @server_locked_icons = {}
+
         @selected_server ||= nil
         @selected_color = 0xff_666655
+
         @filters = Store.settings[:server_list_filters] || {}
         @filter_region = Store.settings[:server_list_region] || "Any" # "Any", "North America", "Europe"
 
@@ -127,7 +130,7 @@ class W3DHub
             server_container = flow(width: 1.0, height: 48, hover: { background: 0xff_555566 }, active: { background: 0xff_555588 }) do
               background 0xff_333333 if i.odd?
 
-              image game_icon(server.game), width: 0.08, padding: 4
+              image game_icon(server), width: 0.08, padding: 4
 
               stack(width: 0.45, height: 1.0) do
                 inscription "<b>#{server&.status&.name}</b>"
@@ -191,7 +194,7 @@ class W3DHub
           stack(width: 1.0, height: 1.0, padding: 8) do
             stack(width: 1.0, height: 0.3) do
               flow(width: 1.0, height: 0.2) do
-                image game_icon(server.game), width: 0.05
+                image game_icon(server), width: 0.05
                 tagline server.status.name, width: 0.949, text_wrap: :none
               end
 
@@ -317,8 +320,19 @@ class W3DHub
         end
       end
 
-      def game_icon(game)
-        "#{GAME_ROOT_PATH}/media/icons/#{game.nil? ? 'ren' : game}.png"
+      def game_icon(server)
+        if server.status.password
+          @server_locked_icons[server.game] ||= Gosu.render(96, 96) do
+            i = get_image("#{GAME_ROOT_PATH}/media/icons/#{server.game.nil? ? 'ren' : server.game}.png")
+            lock = get_image("#{GAME_ROOT_PATH}/media/ui_icons/locked.png")
+            scale = [96.0 / i.width, 96.0 / i.height].min
+
+            i.draw(0, 0, 0, scale, scale)
+            lock.draw(96 - lock.width * 0.5, 96 - lock.height * 0.5, 0, 0.5, 0.5, 0xff_ff8800)
+          end
+        else
+          "#{GAME_ROOT_PATH}/media/icons/#{server.game.nil? ? 'ren' : server.game}.png"
+        end
       end
 
       def game_name(game)
diff --git a/media/ui_icons/locked.png b/media/ui_icons/locked.png
new file mode 100644
index 0000000000000000000000000000000000000000..22189be3da2b1cacf7dd12a31cb1daff1a123a4a
GIT binary patch
literal 15262
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

literal 0
HcmV?d00001