Fix deployed tray remote looking weird

jaredcat · jaredcat · commit f992b71dd34e · 2026-01-30T18:06:26.000-08:00
diff --git a/.github/workflows/build-tray.yml b/.github/workflows/build-tray.yml
@@ -39,13 +39,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install -y libwebkit2gtk-4.1-dev libappindicator3-dev librsvg2-dev patchelf
 
-      - name: Install dependencies (Windows)
-        if: matrix.platform == 'windows-latest'
-        run: choco install rsvg-convert -y
-
-      - name: Install dependencies (macOS)
-        if: matrix.platform == 'macos-latest'
-        run: brew install librsvg
+      - name: Download icons
+        uses: actions/download-artifact@v4
+        with:
+          name: icons
+          path: lgtv-tray-remote/src-tauri/icons/
 
       - name: Setup Rust
         uses: dtolnay/rust-toolchain@stable
@@ -66,11 +64,6 @@ jobs:
           sed -i.bak "s/\"version\": \"[^\"]*\"/\"version\": \"$VERSION\"/" src-tauri/tauri.conf.json
           sed -i.bak "s/^version = \"[^\"]*\"/version = \"$VERSION\"/" src-tauri/Cargo.toml
 
-      - name: Generate icons
-        shell: bash
-        working-directory: lgtv-tray-remote
-        run: ./generate-icons.sh
-
       - name: Install Tauri CLI
         run: cargo install tauri-cli
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -14,12 +14,15 @@ permissions:
   contents: write
 
 jobs:
-  # Get version from tag or input
+  # Get version and generate icons
   prepare:
     runs-on: ubuntu-latest
     outputs:
       version: ${{ steps.version.outputs.version }}
     steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
       - name: Get version
         id: version
         run: |
@@ -29,14 +32,29 @@ jobs:
             echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
           fi
 
+      - name: Install icon tools
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y librsvg2-bin imagemagick icoutils
+
+      - name: Generate icons
+        working-directory: lgtv-tray-remote
+        run: ./generate-icons.sh
+
+      - name: Upload icons
+        uses: actions/upload-artifact@v4
+        with:
+          name: icons
+          path: lgtv-tray-remote/src-tauri/icons/
+
   # Build KDE Plasmoid
   build-plasmoid:
     needs: prepare
     uses: ./.github/workflows/build-plasmoid.yml
     with:
       version: ${{ needs.prepare.outputs.version }}
 
-  # Build Tauri tray app
+  # Build Tauri tray app (needs prepare for icons artifact)
   build-tray:
     needs: prepare
     uses: ./.github/workflows/build-tray.yml
diff --git a/lgtv-tray-remote/README.md b/lgtv-tray-remote/README.md
@@ -29,7 +29,7 @@ Or add to your NixOS configuration:
 ```nix
 nix.settings = {
   substituters = [ "https://lgtv-tray-remote.cachix.org" ];
-  trusted-public-keys = [ "lgtv-tray-remote.cachix.org-1:lgtv-tray-remote.cachix.org-1:no3KeuRIc/+Msy8eQLsIVy29FZ85KI2GC6/jJkMMrvg=" ];
+  trusted-public-keys = [ "lgtv-tray-remote.cachix.org-1:no3KeuRIc/+Msy8eQLsIVy29FZ85KI2GC6/jJkMMrvg=" ];
 };
 ```
 
diff --git a/lgtv-tray-remote/flake.nix b/lgtv-tray-remote/flake.nix
@@ -95,6 +95,8 @@
             imagemagick
             makeWrapper
             copyDesktopItems
+            fontconfig
+            dejavu_fonts
           ];
 
           inherit buildInputs;
@@ -140,7 +142,9 @@ EOF
             wrapProgram $out/bin/lgtv-tray-remote \
               --prefix LD_LIBRARY_PATH : "${pkgs.lib.makeLibraryPath (buildInputs ++ runtimeLibs)}" \
               --set WEBKIT_DISABLE_COMPOSITING_MODE 1 \
-              --set WEBKIT_DISABLE_DMABUF_RENDERER 1
+              --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \
+              --set FONTCONFIG_FILE "${pkgs.fontconfig.out}/etc/fonts/fonts.conf" \
+              --prefix XDG_DATA_DIRS : "${pkgs.dejavu_fonts}/share"
             
             runHook postInstall
           '';
diff --git a/lgtv-tray-remote/generate-icons.sh b/lgtv-tray-remote/generate-icons.sh
@@ -34,9 +34,9 @@ else
 fi
 
 # Generate Windows .ico
-if command -v convert &> /dev/null; then
+if command -v magick &> /dev/null; then
     echo "Generating Windows .ico..."
-    convert "$ICON_DIR/32x32.png" "$ICON_DIR/128x128.png" "$ICON_DIR/128x128@2x.png" "$ICON_DIR/icon.ico"
+    magick "$ICON_DIR/32x32.png" "$ICON_DIR/128x128.png" "$ICON_DIR/128x128@2x.png" "$ICON_DIR/icon.ico"
 elif command -v icotool &> /dev/null; then
     icotool -c -o "$ICON_DIR/icon.ico" "$ICON_DIR/32x32.png" "$ICON_DIR/128x128.png"
 else
diff --git a/lgtv-tray-remote/src-tauri/tauri.conf.json b/lgtv-tray-remote/src-tauri/tauri.conf.json
@@ -18,7 +18,7 @@
         "label": "main",
         "title": "LG TV Remote",
         "width": 320,
-        "height": 500,
+        "height": 520,
         "resizable": true,
         "visible": false,
         "decorations": false,
diff --git a/lgtv-tray-remote/src/index.html b/lgtv-tray-remote/src/index.html
@@ -16,15 +16,15 @@ <h1>LG TV Remote</h1>
           <span id="status-dot" class="dot disconnected"></span>
           <span id="status-text">Not Connected</span>
         </div>
-        <button class="btn-icon quit-btn" onclick="quitApp()" title="Quit">&#10005;</button>
+        <button class="btn-icon quit-btn" onclick="quitApp()" title="Quit">&times;</button>
       </div>
     </header>
 
     <!-- Settings Panel (collapsible) -->
     <section id="settings-panel" class="settings collapsed">
       <button class="settings-toggle" onclick="toggleSettings()">
-        <span class="icon">&#9881;</span> Settings
-        <span class="arrow">&#9662;</span>
+        <span class="icon">&#x2699;</span> Settings
+        <span class="arrow">&#x25BC;</span>
       </button>
       <div class="settings-content">
         <div class="field">
@@ -66,42 +66,42 @@ <h1>LG TV Remote</h1>
     <section class="dpad">
       <div class="dpad-grid">
         <div></div>
-        <button class="btn dpad-btn" onclick="sendButton('UP')" title="Up">&#9650;</button>
+        <button class="btn dpad-btn" onclick="sendButton('UP')" title="Up">&uarr;</button>
         <div></div>
-        <button class="btn dpad-btn" onclick="sendButton('LEFT')" title="Left">&#9664;</button>
+        <button class="btn dpad-btn" onclick="sendButton('LEFT')" title="Left">&larr;</button>
         <button class="btn dpad-btn ok-btn" onclick="sendButton('ENTER')" title="OK">OK</button>
-        <button class="btn dpad-btn" onclick="sendButton('RIGHT')" title="Right">&#9654;</button>
+        <button class="btn dpad-btn" onclick="sendButton('RIGHT')" title="Right">&rarr;</button>
         <div></div>
-        <button class="btn dpad-btn" onclick="sendButton('DOWN')" title="Down">&#9660;</button>
+        <button class="btn dpad-btn" onclick="sendButton('DOWN')" title="Down">&darr;</button>
         <div></div>
       </div>
     </section>
 
     <!-- Volume Controls -->
     <section class="volume">
       <button class="btn" onclick="volumeDown()" title="Volume Down">
-        <span class="icon">&#128265;</span> Vol -
+        <span class="icon">-</span> Vol
       </button>
-      <button class="btn icon-btn" onclick="setMute(true)" title="Mute">&#128263;</button>
-      <button class="btn icon-btn" onclick="setMute(false)" title="Unmute">&#128266;</button>
+      <button class="btn icon-btn" onclick="setMute(true)" title="Mute">M</button>
+      <button class="btn icon-btn" onclick="setMute(false)" title="Unmute">U</button>
       <button class="btn" onclick="volumeUp()" title="Volume Up">
-        Vol + <span class="icon">&#128266;</span>
+        Vol <span class="icon">+</span>
       </button>
     </section>
 
     <!-- Quick Actions -->
     <section class="actions">
       <button class="btn action-btn" onclick="powerOn()" title="Power On">
-        <span class="icon">&#9211;</span> Power On
+        Power On
       </button>
       <button class="btn action-btn danger" onclick="powerOff()" title="Power Off">
-        <span class="icon">&#9211;</span> Power Off
+        Power Off
       </button>
       <button class="btn action-btn" onclick="sendButton('HOME')" title="Home">
-        <span class="icon">&#8962;</span> Home
+        Home
       </button>
       <button class="btn action-btn" onclick="sendButton('BACK')" title="Back">
-        <span class="icon">&#8592;</span> Back
+        &larr; Back
       </button>
     </section>
 
diff --git a/lgtv-tray-remote/src/style.css b/lgtv-tray-remote/src/style.css
@@ -19,7 +19,7 @@
 }
 
 body {
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, 'Noto Sans', 'DejaVu Sans', sans-serif;
   background: var(--bg-primary);
   color: var(--text-primary);
   user-select: none;

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`body {`
`22`		`- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, sans-serif;`
	`22`	`+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, 'Noto Sans', 'DejaVu Sans', sans-serif;`
`23`	`23`	`background: var(--bg-primary);`
`24`	`24`	`color: var(--text-primary);`
`25`	`25`	`user-select: none;`