Merge branch 'master' of https://github.com/KillzXGaming/Switch-Toolbox

KillzXGaming · Dec 1, 2023 · f31a91d · f31a91d
2 parents 194dbd4 + 9f77001
commit f31a91d
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 48 deletions.
diff --git a/File_Format_Library/GUI/BFLYT/Editor/Materials/Texture_Selector.Designer.cs b/File_Format_Library/GUI/BFLYT/Editor/Materials/Texture_Selector.Designer.cs
diff --git a/File_Format_Library/GUI/BFLYT/Editor/Materials/Texture_Selector.resx b/File_Format_Library/GUI/BFLYT/Editor/Materials/Texture_Selector.resx
@@ -134,7 +134,7 @@
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDTbOhAAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAGXRF
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDTbOhAAAACXBIWXMAAA7CAAAOwgEVKEqAAAAAGXRF
         WHRTb2Z0d2FyZQBwYWludC5uZXQgNC4wLjIx8SBplQAAK8tJREFUeF7t3Qlz21iSBGDZOnifAEiABHif
         Ou2e///ftu3OrBILitBMrzzjtvOLaHcHkqsCHnMghfdRuIqyp39d+JIgoM4eCXzdIjCrr4jg3EZAySMS
         eMoR0HV4wb9WN0hoGWYc+wioi4D+yBDQzRkJLRtI4DpHQI8dJNT9goTSz0igtUFAu3Adn+KMf4WTuBqF

diff --git a/File_Format_Library/GUI/BFRES/Materials/Texture Selector.Designer.cs b/File_Format_Library/GUI/BFRES/Materials/Texture Selector.Designer.cs
diff --git a/File_Format_Library/GUI/BFRES/Materials/Texture Selector.cs b/File_Format_Library/GUI/BFRES/Materials/Texture Selector.cs
@@ -109,7 +109,8 @@ private void DisplayTexture(STGenericTexture texData)
 
                 if (pictureBoxCustom1.InvokeRequired)
                 {
-                    pictureBoxCustom1.Invoke((MethodInvoker)delegate {
+                    pictureBoxCustom1.Invoke((MethodInvoker)delegate
+                    {
                         pictureBoxCustom1.Image = image;
                         pictureBoxCustom1.Refresh();
                     });
@@ -122,7 +123,7 @@ private void DisplayTexture(STGenericTexture texData)
 
         private void listView1_DoubleClick(object sender, EventArgs e)
         {
-            DialogResult = DialogResult.OK; 
+            DialogResult = DialogResult.OK;
         }
 
         private void addTextureBtn_Click(object sender, EventArgs e)
@@ -221,11 +222,25 @@ private void listView1_DrawColumnHeader(object sender, DrawListViewColumnHeaderE
             {
                 e.Graphics.FillRectangle(backBrush, e.Bounds);
             }
-            using (SolidBrush foreBrush = new SolidBrush(Color.FromArgb(255,255,255)))
+
+            using (SolidBrush foreBrush = new SolidBrush(Color.FromArgb(255, 255, 255)))
             {
                 e.Graphics.DrawString(e.Header.Text, e.Font, foreBrush, e.Bounds);
             }
-       //     e.DrawText();
+
+            //     e.DrawText();
+        }
+
+        private void listView1_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.KeyCode == Keys.Enter)
+            {
+                if (listView1.SelectedItems.Count > 0)
+                {
+                    DialogResult = DialogResult.OK;
+                    Close();
+                }
+            }
         }
     }
-}
+}
diff --git a/File_Format_Library/GUI/BFRES/Materials/Texture Selector.resx b/File_Format_Library/GUI/BFRES/Materials/Texture Selector.resx
@@ -134,7 +134,7 @@
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
         AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
-        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDTbOhAAAACXBIWXMAAA7DAAAOwwHHb6hkAAAAGXRF
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACDTbOhAAAACXBIWXMAAA7BAAAOwQG4kWvtAAAAGXRF
         WHRTb2Z0d2FyZQBwYWludC5uZXQgNC4wLjIx8SBplQAAK8tJREFUeF7t3Qlz21iSBGDZOnifAEiABHif
         Ou2e///ftu3OrBILitBMrzzjtvOLaHcHkqsCHnMghfdRuIqyp39d+JIgoM4eCXzdIjCrr4jg3EZAySMS
         eMoR0HV4wb9WN0hoGWYc+wioi4D+yBDQzRkJLRtI4DpHQI8dJNT9goTSz0igtUFAu3Adn+KMf4WTuBqF