data-model and LaunchMode = LaunchMode.SingleTask

rbfx · Jan 30, 2025 · 05e96a1 · 05e96a1
1 parent 5462b62
commit 05e96a1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/Content/Common/Data/UI/Inventory.rml b/Content/Common/Data/UI/Inventory.rml
@@ -25,7 +25,7 @@
 		</style>
 	</head>
 	<body>
-		<div class="gray-outer-panel" style="position:absolute; width:25vw; height:100vh" data-model="GameRmlUIComponent">
+		<div data-model="GameRmlUIComponent" class="gray-outer-panel" style="position:absolute; width:25vw; height:100vh">
 			Inventory items: {{ inventory_items.size }}<br/>
 			<div class="gray-inner-panel" style="display: block;" data-for="item_value : inventory_items">
 				{{ item_value.name }}

diff --git a/Content/Common/Data/UI/Options.rml b/Content/Common/Data/UI/Options.rml
@@ -36,8 +36,8 @@
 		</style>
 	</head>
 
-	<body data-model="GameRmlUIComponent"  style="width: 100%; height: 100%; margin: 0; decorator: image(../Images/Background.png); nav: auto">
-		<div class="gray-inner-panel menu-panel" style="top: 50%; left: 50%; position: absolute; transform: translate(-50%, -50%); max-height: 90%; max-height: 90%; min-width: 800px">
+	<body style="width: 100%; height: 100%; margin: 0; decorator: image(../Images/Background.png); nav: auto">
+		<div data-model="GameRmlUIComponent" class="gray-inner-panel menu-panel" style="top: 50%; left: 50%; position: absolute; transform: translate(-50%, -50%); max-height: 90%; max-height: 90%; min-width: 800px">
 			<div style="text-align: center">Settings</div>
 			<br/>
 			<table>

diff --git a/RbfxTemplate.Android/MainActivity.cs b/RbfxTemplate.Android/MainActivity.cs
@@ -7,7 +7,7 @@ namespace RbfxTemplate
 {
     [Activity(Label = "@string/app_name",
         ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.KeyboardHidden,
-        Theme = "@android:style/Theme.NoTitleBar.Fullscreen", HardwareAccelerated = true, MainLauncher = true)]
+        Theme = "@android:style/Theme.NoTitleBar.Fullscreen", HardwareAccelerated = true, MainLauncher = true, LaunchMode = LaunchMode.SingleTask)]
     public class MainActivity : UrhoActivity
     {
         protected override void OnResume()

diff --git a/RbfxTemplate.sln b/RbfxTemplate.sln
@@ -25,6 +25,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{D82AE45E
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IconUpdater", "Tools\IconUpdater\IconUpdater.csproj", "{2940DEDC-756B-43AE-BAD2-49BFA7D83009}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GithubActions", "GithubActions", "{AA9C6A90-F458-4AB6-9AF8-EED4BC308B3C}"
+	ProjectSection(SolutionItems) = preProject
+		.github\workflows\build-master.yml = .github\workflows\build-master.yml
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -143,6 +148,7 @@ Global
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{2940DEDC-756B-43AE-BAD2-49BFA7D83009} = {D82AE45E-DEA4-4B99-897B-80FF32460DFF}
+		{AA9C6A90-F458-4AB6-9AF8-EED4BC308B3C} = {7DE6BF8D-C5F4-4C2A-8F02-525A97B81F1D}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {DFC4B6F7-CE69-4022-B783-EB634FF510C9}