Misc portrait layout fixes, minor build.gradle.kts change

UI/BaseScreens.cpp

@@ -1,10 +1,6 @@
 #include "UI/BaseScreens.h"
 #include "Core/Config.h"
 
-ViewLayoutMode UIBaseScreen::LayoutMode() const {
-	return ViewLayoutMode::IgnoreBottomInset;
-}
-
 bool UIBaseScreen::UseImmersiveMode() const {
 	DisplayLayoutConfig &config = g_Config.GetDisplayLayoutConfig(GetDeviceOrientation());
 	bool portrait = GetDeviceOrientation() == DeviceOrientation::Portrait;

UI/BaseScreens.h

@@ -8,7 +8,9 @@
 class UIBaseScreen : public UIScreen {
 public:
 	UIBaseScreen() : UIScreen() {}
-	ViewLayoutMode LayoutMode() const override;
+	ViewLayoutMode LayoutMode() const override {
+		return ViewLayoutMode::IgnoreBottomInset;
+	}
 	bool UseImmersiveMode() const override;
 protected:
 	void sendMessage(UIMessage message, const char *value) override;

UI/SavedataScreen.h

@@ -95,6 +95,10 @@ public:
 	void dialogFinished(const Screen *dialog, DialogResult result) override;
 	void sendMessage(UIMessage message, const char *value) override;
 
+	ViewLayoutMode LayoutMode() const override {
+		return ViewLayoutMode::ApplyInsets;
+	}
+
 	const char *tag() const override { return "Savedata"; }
 
 protected:

UI/SimpleDialogScreen.cpp

@@ -46,7 +46,7 @@ void UISimpleBaseDialogScreen::CreateViews() {
 ViewLayoutMode UITwoPaneBaseDialogScreen::LayoutMode() const {
 	const bool portrait = GetDeviceOrientation() == DeviceOrientation::Portrait;
 	if (portrait) {
-		if (((flags_ & TwoPaneFlags::SettingsCanScroll) && !(flags_ & TwoPaneFlags::SettingsToTheRight)) || (flags_ & TwoPaneFlags::ContentsCanScroll)) {
+		if ((flags_ & TwoPaneFlags::SettingsCanScroll) && !(flags_ & TwoPaneFlags::SettingsToTheRight)) {
 			return ViewLayoutMode::IgnoreBottomInset;
 		} else {
 			return ViewLayoutMode::ApplyInsets;