Jasima/godot-xterm
1
0
Fork 0
mirror of https://github.com/lihop/godot-xterm.git synced 2025-05-10 06:05:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update target Godot version: 3.3.2-stable -> 3.4.4-stable

Browse source
This commit is contained in:
Leroy Hopson 2022-05-22 11:37:22 +07:00
parent 1659591d15
commit bb74585c20
No known key found for this signature in database
GPG key ID: D2747312A6DB51AA
6 changed files with 18 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

15
addons/godot_xterm/native/src/terminal.cpp
View file

@ -8,6 +8,7 @@
#include <ResourceLoader.hpp>
#include <Theme.hpp>
#include <algorithm>
#include <string>
#include <xkbcommon/xkbcommon-keysyms.h>
// For _populate_key_list(), see below.
@ -418,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();

2
addons/godot_xterm/native/thirdparty/godot-cpp vendored

@ -1 +1 @@
Subproject commit 26d4df4e174124e1174c624d770661b1394fcf5f
Subproject commit f4f6fac4c784da8c973ade0dbc64a9d8400ee247