From 72e3313c305efef1950971f2465d98c10ac5a164 Mon Sep 17 00:00:00 2001
From: mittorn <mittorn@sibmail.com>
Date: Thu, 5 Apr 2018 11:57:41 +0700
Subject: [PATCH] Remove gkitchy adjustViewBounds, add landscape hack

---
 res/layout/tutorial_step.xml                   | 7 ++++---
 src/in/celest/xash3d/XashTutorialActivity.java | 6 ++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/res/layout/tutorial_step.xml b/res/layout/tutorial_step.xml
index 24a956c1..f22bd18a 100644
--- a/res/layout/tutorial_step.xml
+++ b/res/layout/tutorial_step.xml
@@ -6,17 +6,18 @@
 			android:layout_width="fill_parent"
 			android:layout_height="match_parent"
 			android:orientation="vertical"
+			android:layout_gravity="top"
 			android:layout_weight="1">
 
 
 			<ImageView
 				android:id="@+id/image"
 				android:layout_width="fill_parent"
-				android:layout_height="wrap_content"
+				android:layout_height="fill_parent"
 				android:layout_gravity="fill_horizontal|top"
 				android:layout_marginBottom="16dp"
-				android:layout_marginTop="16dp"
-				android:adjustViewBounds="true" />
+				android:layout_marginTop="0dp"
+				android:scaleType="fitStart"/>
 		</LinearLayout>
 
 		<TextView
diff --git a/src/in/celest/xash3d/XashTutorialActivity.java b/src/in/celest/xash3d/XashTutorialActivity.java
index 368f5cb7..d495dac3 100644
--- a/src/in/celest/xash3d/XashTutorialActivity.java
+++ b/src/in/celest/xash3d/XashTutorialActivity.java
@@ -185,7 +185,7 @@ public class XashTutorialActivity extends Activity implements View.OnClickListen
 		LayoutInflater inflater;
 
 		inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);              
-		LinearLayout container = (LinearLayout)findViewById(R.id.container);
+		ViewGroup container = (ViewGroup)findViewById(R.id.container);
 
 		DisplayMetrics metrics = new DisplayMetrics();
 		getWindowManager().getDefaultDisplay().getMetrics(metrics);
@@ -200,7 +200,7 @@ public class XashTutorialActivity extends Activity implements View.OnClickListen
 			if( titleres == 0 )
 				break;
 			
-			LinearLayout layout = (LinearLayout) inflater.inflate(R.layout.tutorial_step , null);
+			ViewGroup layout = (ViewGroup) inflater.inflate(R.layout.tutorial_step , null);
 			
 			TextView title = (TextView) layout.findViewById(R.id.title);
 			TextView text = (TextView) layout.findViewById(R.id.content);
@@ -215,6 +215,8 @@ public class XashTutorialActivity extends Activity implements View.OnClickListen
 
 			title.setText(titleres);
 			text.setText(contentres);
+			if( FWGSLib.isLandscapeOrientation(this) )
+				drawable.setScaleType(ImageView.ScaleType.FIT_CENTER);
 			drawable.setImageResource(drawableres);
 			scroll.addPage(layout);
 			numPages++;