From 862616c856d1ed1a22b5e6a0dc723825efb3e01a Mon Sep 17 00:00:00 2001 From: JFronny Date: Tue, 9 Jul 2024 14:40:02 +0200 Subject: [PATCH] fix: properly escape markup in more places --- .../inceptum/gtk/control/InstanceListEntryFactory.kt | 7 ++----- .../inceptum/gtk/window/settings/instance/ModsTab.kt | 4 ++-- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/InstanceListEntryFactory.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/InstanceListEntryFactory.kt index bec2ac8..ab4a67d 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/InstanceListEntryFactory.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/control/InstanceListEntryFactory.kt @@ -6,10 +6,7 @@ import io.gitlab.jfronny.inceptum.common.MetaHolder import io.gitlab.jfronny.inceptum.common.Utils import io.gitlab.jfronny.inceptum.gtk.GtkMenubar import io.gitlab.jfronny.inceptum.gtk.menu.MenuBuilder -import io.gitlab.jfronny.inceptum.gtk.util.I18n -import io.gitlab.jfronny.inceptum.gtk.util.fixSubtitle -import io.gitlab.jfronny.inceptum.gtk.util.get -import io.gitlab.jfronny.inceptum.gtk.util.margin +import io.gitlab.jfronny.inceptum.gtk.util.* import io.gitlab.jfronny.inceptum.gtk.window.settings.instance.InstanceSettingsWindow import io.gitlab.jfronny.inceptum.launcher.LauncherEnv import io.gitlab.jfronny.inceptum.launcher.system.instance.Instance @@ -63,7 +60,7 @@ class InstanceListEntryFactory( else I18n["instance.launch.locked.setup"] } - widget.title = data.instance.toString() + widget.title = data.instance.toString().escapedMarkup data.thumbnail.bind(data.instance!!) diff --git a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ModsTab.kt b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ModsTab.kt index da6e31e..4ce0fd7 100644 --- a/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ModsTab.kt +++ b/launcher-gtk/src/main/kotlin/io/gitlab/jfronny/inceptum/gtk/window/settings/instance/ModsTab.kt @@ -202,8 +202,8 @@ class ModsTab(window: InstanceSettingsWindow) : SettingsTab