From ca761352732f95a93b2f1251fda304e808565307 Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Tue, 20 Aug 2013 12:28:17 +0200 Subject: [PATCH] Don't let the tabs overflow into the right area of the main screen if small resolution. Update native with new tab look. --- UI/GameSettingsScreen.cpp | 5 ++++- UI/MainScreen.cpp | 3 +++ native | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 769b751381..0bfcacb42a 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -290,6 +290,7 @@ void GameSettingsScreen::CreateViews() { std::string atracString; atracString.assign(Atrac3plus_Decoder::IsInstalled() ? "Redownload Atrac3+ plugin" : "Download Atrac3+ plugin"); + audioSettings->Add(new ItemHeader(ms->T("Audio"))); audioSettings->Add(new Choice(a->T(atracString.c_str())))->OnClick.Handle(this, &GameSettingsScreen::OnDownloadPlugin); audioSettings->Add(new PopupSliderChoice(&g_Config.iSFXVolume, 0, 8, a->T("SFX volume"), screenManager())); @@ -304,12 +305,14 @@ void GameSettingsScreen::CreateViews() { controlsSettings->SetSpacing(0); controlsSettingsScroll->Add(controlsSettings); tabHolder->AddTab(ms->T("Controls"), controlsSettingsScroll); + controlsSettings->Add(new ItemHeader(ms->T("Controls"))); controlsSettings->Add(new Choice(gs->T("Control Mapping")))->OnClick.Handle(this, &GameSettingsScreen::OnControlMapping); + controlsSettings->Add(new CheckBox(&g_Config.bAccelerometerToAnalogHoriz, c->T("Tilt", "Tilt to Analog (horizontal)"))); + controlsSettings->Add(new ItemHeader(c->T("OnScreen", "On-Screen Touch Controls"))); controlsSettings->Add(new CheckBox(&g_Config.bShowTouchControls, c->T("OnScreen", "On-Screen Touch Controls"))); controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 0, 85, c->T("Button Opacity"), screenManager())); controlsSettings->Add(new PopupSliderChoiceFloat(&g_Config.fButtonScale, 1.15, 2.05, c->T("Button Scaling"), screenManager())); controlsSettings->Add(new CheckBox(&g_Config.bShowAnalogStick, c->T("Show Left Analog Stick"))); - controlsSettings->Add(new CheckBox(&g_Config.bAccelerometerToAnalogHoriz, c->T("Tilt", "Tilt to Analog (horizontal)"))); // System ViewGroup *systemSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT)); diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp index b1a5df99f4..173df0d154 100644 --- a/UI/MainScreen.cpp +++ b/UI/MainScreen.cpp @@ -351,6 +351,8 @@ void GameBrowser::Refresh() { // Kill all the contents Clear(); + Add(new Spacer(5.0f)); + if (allowBrowsing_) { LinearLayout *topBar = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)); topBar->Add(new TextView(path_.GetFriendlyPath().c_str(), ALIGN_VCENTER, 0.7f, new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT, 1.0f))); @@ -466,6 +468,7 @@ void MainScreen::CreateViews() { root_ = new LinearLayout(ORIENT_HORIZONTAL); TabHolder *leftColumn = new TabHolder(ORIENT_HORIZONTAL, 64, new LinearLayoutParams(1.0)); + leftColumn->SetClip(true); root_->Add(leftColumn); ScrollView *scrollRecentGames = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)); diff --git a/native b/native index 3e65b41753..ecd8e52e0a 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 3e65b41753bb3fdb6413e46c93a277c3793aa4fa +Subproject commit ecd8e52e0aadbf7680ad83671f85d6d351a784cf