From fde082a88fd7c5bc2fde63682b527459d32e750d Mon Sep 17 00:00:00 2001
From: Leroy Hopson <git@leroy.geek.nz>
Date: Sun, 22 May 2022 11:37:22 +0700
Subject: [PATCH] Update target Godot version: 3.3.2-stable -> 3.4.4-stable

Also apply automatic updates to .import files after opening project in
3.4.4 editor.
---
 .github/workflows/main.yml                         |  6 +-----
 CHANGELOG.md                                       |  1 +
 addons/godot_xterm/native/src/terminal.cpp         | 14 ++++++--------
 addons/godot_xterm/nodes/pty/pty_icon.svg.import   |  1 +
 .../nodes/terminal/terminal_icon.svg.import        |  1 +
 icon.png.import                                    |  1 +
 project.godot                                      |  4 ----
 7 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index f3712b9..d9b3f18 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,10 +6,6 @@ on:
     - cron: 0 11 * * *
 
 env:
-  GODOT: Godot_v3.4.3-stable
-  GODOT_VERSION: 3.4.3
-  GODOT_RELEASE: stable
-
   # Caches should be automatically invalidated when versions change,
   # but invalidation can be forced by incrementing these numbers.
   EMSCRIPTEN_CACHE_VERSION: 1
@@ -268,7 +264,7 @@ jobs:
       matrix:
         os: [ windows-latest, macos-latest, ubuntu-latest ]
         bits: [ 64, 32 ]
-        godot_version: [ 'v3.2-stable', 'v3.3.4-stable', 'v3.4.3-stable', 'v3.5-beta1' ]
+        godot_version: [ 'v3.2-stable', 'v3.3.4-stable', 'v3.4.4-stable', 'v3.5-beta1' ]
         exclude:
           - os: macos-latest
             bits: 32
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4da54a..a82d6a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Linux binaries now support systems with older GLIBC versions. By building the
   binaries inside a docker container with an older GLIBC version, the minimum
   required GLIBC version is now 2.17 which was released in 2012.
+- Target Godot version from 3.3.2-stable -> 3.4.4-stable.
 
 ### Fixed
 - The `kill()` method of unix PTY node can now be called without error as the underlying
diff --git a/addons/godot_xterm/native/src/terminal.cpp b/addons/godot_xterm/native/src/terminal.cpp
index 6ad8fa7..0d67f81 100644
--- a/addons/godot_xterm/native/src/terminal.cpp
+++ b/addons/godot_xterm/native/src/terminal.cpp
@@ -419,14 +419,12 @@ void Terminal::update_theme() {
                                                  Color default_color) -> void {
     Color c;
 
-    c = has_color(theme_color, "Terminal")
-            ? get_color(theme_color, "Terminal")
-            : has_color_override(theme_color)
-                  ? get_color(theme_color, "")
-                  : (default_theme != nullptr &&
-                     default_theme->has_color(theme_color, "Terminal"))
-                        ? default_theme->get_color(theme_color, "Terminal")
-                        : default_color;
+    c = has_color(theme_color, "Terminal") ? get_color(theme_color, "Terminal")
+        : has_color_override(theme_color)  ? get_color(theme_color, "")
+        : (default_theme != nullptr &&
+           default_theme->has_color(theme_color, "Terminal"))
+            ? default_theme->get_color(theme_color, "Terminal")
+            : default_color;
 
     color_palette[color][0] = c.get_r8();
     color_palette[color][1] = c.get_g8();
diff --git a/addons/godot_xterm/nodes/pty/pty_icon.svg.import b/addons/godot_xterm/nodes/pty/pty_icon.svg.import
index c9a8f4d..02be896 100644
--- a/addons/godot_xterm/nodes/pty/pty_icon.svg.import
+++ b/addons/godot_xterm/nodes/pty/pty_icon.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true
diff --git a/addons/godot_xterm/nodes/terminal/terminal_icon.svg.import b/addons/godot_xterm/nodes/terminal/terminal_icon.svg.import
index 0e96ff9..9065d01 100644
--- a/addons/godot_xterm/nodes/terminal/terminal_icon.svg.import
+++ b/addons/godot_xterm/nodes/terminal/terminal_icon.svg.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true
diff --git a/icon.png.import b/icon.png.import
index 96cbf46..a4c02e6 100644
--- a/icon.png.import
+++ b/icon.png.import
@@ -28,6 +28,7 @@ process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
 process/invert_color=false
+process/normal_map_invert_y=false
 stream=false
 size_limit=0
 detect_3d=true
diff --git a/project.godot b/project.godot
index 95424ee..a914103 100644
--- a/project.godot
+++ b/project.godot
@@ -8,10 +8,6 @@
 
 config_version=4
 
-_global_script_classes=[  ]
-_global_script_class_icons={
-}
-
 [application]
 
 config/name="Godot Xterm"