Update native with layout bugfix, fixing scrolling issue in savestate list. Tweak layout a little.

This commit is contained in:
Henrik Rydgard 2015-02-02 09:12:56 +01:00
parent da6375d89d
commit 9e162f30ab
2 changed files with 4 additions and 3 deletions

View file

@ -258,13 +258,14 @@ void GamePauseScreen::CreateViews() {
static const int NUM_SAVESLOTS = 5;
using namespace UI;
Margins actionMenuMargins(0, 100, 15, 0);
Margins scrollMargins(0, 20, 0, 0);
Margins actionMenuMargins(0, 20, 15, 0);
I18NCategory *gs = GetI18NCategory("Graphics");
I18NCategory *i = GetI18NCategory("Pause");
root_ = new LinearLayout(ORIENT_HORIZONTAL);
ViewGroup *leftColumn = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(1.0, actionMenuMargins));
ViewGroup *leftColumn = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(1.0, scrollMargins));
root_->Add(leftColumn);
ViewGroup *leftColumnItems = new LinearLayout(ORIENT_VERTICAL, new LayoutParams(FILL_PARENT, WRAP_CONTENT));

2
native

@ -1 +1 @@
Subproject commit 5becb9a4be8f6e18b102de4eafe902284e9faded
Subproject commit 04515e403153472a56f5db826c1dfd060e785411