From 0b02e08b722f4c9c1e454b743af527097b1193bf Mon Sep 17 00:00:00 2001
From: "Ayato (Shahil)" <67567036+Shahil-Ayato@users.noreply.github.com>
Date: Thu, 11 Feb 2021 00:57:39 -0800
Subject: [PATCH] Hotfix for Joy-Con Images (#2011)

The Joy-Con images should no longer be stretched on Windows
(P.S I hate Windows :p)
---
 .../Ui/Resources/Controller_JoyConPair.svg    | 24 +++++++------------
 Ryujinx/Ui/Windows/ControllerWindow.cs        |  6 ++---
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/Ryujinx/Ui/Resources/Controller_JoyConPair.svg b/Ryujinx/Ui/Resources/Controller_JoyConPair.svg
index 86f2901a7..fe6a9f813 100644
--- a/Ryujinx/Ui/Resources/Controller_JoyConPair.svg
+++ b/Ryujinx/Ui/Resources/Controller_JoyConPair.svg
@@ -50,13 +50,7 @@
      helper_size="0"
      apply_no_weight="true"
      apply_with_weight="true"
-     only_selected="false" /><filter
-     inkscape:collect="always"
-     id="filter3994"
-     color-interpolation-filters="sRGB"><feGaussianBlur
-       inkscape:collect="always"
-       stdDeviation="0.95"
-       id="feGaussianBlur3996" /></filter></defs><sodipodi:namedview
+     only_selected="false" /></defs><sodipodi:namedview
    pagecolor="#ffffff"
    bordercolor="#666666"
    borderopacity="1"
@@ -69,9 +63,9 @@
    inkscape:window-height="1003"
    id="namedview157"
    showgrid="false"
-   inkscape:zoom="1"
-   inkscape:cx="296.32143"
-   inkscape:cy="348.01692"
+   inkscape:zoom="2"
+   inkscape:cx="872.63708"
+   inkscape:cy="388.56525"
    inkscape:window-x="1400"
    inkscape:window-y="0"
    inkscape:window-maximized="1"
@@ -593,11 +587,6 @@
      id="path4144"
      inkscape:connector-curvature="0"
      sodipodi:nodetypes="sccccccs" /><path
-     transform="matrix(0,2.2780047,2.324737,0,-1649.6057,-2044.5765)"
-     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter3994)"
-     d="m 1036.7923,1045.6825 v 38"
-     id="path4152"
-     inkscape:connector-curvature="0" /><path
      sodipodi:nodetypes="sccccccs"
      inkscape:connector-curvature="0"
      id="path4160"
@@ -700,4 +689,7 @@
      style="fill:#b3b3b3;fill-opacity:1;stroke:#000000;stroke-width:0.0325267;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
      d="m 162.42612,152.06817 v -10.42336 h 2.45836 2.45836 v 8.66103 8.66102 h 6.16349 6.16346 v 1.76236 1.76232 h -8.62185 -8.62182 z"
      id="path4220"
-     inkscape:connector-curvature="0" /></g></svg>
+     inkscape:connector-curvature="0" /><path
+     style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+     d="m 724.21326,200.03615 v 6.10386 h 9.9129 V 199.759 Z"
+     id="path979" /></g></svg>
diff --git a/Ryujinx/Ui/Windows/ControllerWindow.cs b/Ryujinx/Ui/Windows/ControllerWindow.cs
index a5345b035..e06c6c6be 100644
--- a/Ryujinx/Ui/Windows/ControllerWindow.cs
+++ b/Ryujinx/Ui/Windows/ControllerWindow.cs
@@ -254,9 +254,9 @@ namespace Ryujinx.Ui.Windows
             _controllerImage.Pixbuf = _controllerType.ActiveId switch
             {
                 "ProController" => new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Controller_ProCon.svg", 400, 400),
-                "JoyconLeft"    => new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Controller_JoyConLeft.svg", 400, 400),
-                "JoyconRight"   => new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Controller_JoyConRight.svg", 400, 400),
-                _               => new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Controller_JoyConPair.svg", 400, 400),
+                "JoyconLeft"    => new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Controller_JoyConLeft.svg", 400, 500),
+                "JoyconRight"   => new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Controller_JoyConRight.svg", 400, 500),
+                _               => new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.Resources.Controller_JoyConPair.svg", 400, 500),
             };
         }