UI fixes (including zip button clickability)

This commit is contained in:
Henrik Rydgard committed 2013-12-11 20:01:17 +01:00
1 parent 92d9ad4fe0
commit a70ed3cb85
3 files changed
+6 -4

No files matched your search

+3 -2
View File
@@ -244,10 +244,11 @@ void GameSettingsScreen::CreateViews() {
layoutEditorChoice_->SetEnabledPtr(&g_Config.bShowTouchControls);
CheckBox *disableDiags = controlsSettings->Add(new CheckBox(&g_Config.bDisableDpadDiagonals, c->T("Disable D-Pad diagonals (4-way touch)")));
disableDiags->SetEnabledPtr(&g_Config.bShowTouchControls);
controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 0, 100, c->T("Button Opacity"), screenManager()));
View *opacity = controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 0, 100, c->T("Button Opacity"), screenManager()));
opacity->SetEnabledPtr(&g_Config.bShowTouchControls);
static const char *touchControlStyles[] = {"Classic", "Thin borders"};
View *style = controlsSettings->Add(new PopupMultiChoice(&g_Config.iTouchButtonStyle, c->T("Button style"), touchControlStyles, 0, ARRAY_SIZE(touchControlStyles), c, screenManager()));
disableDiags->SetEnabledPtr(&g_Config.bShowTouchControls);
style->SetEnabledPtr(&g_Config.bShowTouchControls);
// System
ViewGroup *systemSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
+2 -1
View File
@@ -445,10 +445,11 @@ void GameBrowser::Refresh() {
path_.GetListing(fileInfo, "zip:rar:r01:");
if (!fileInfo.empty()) {
UI::LinearLayout *zl = new UI::LinearLayout(UI::ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
zl->SetSpacing(4.0f);
Add(zl);
for (size_t i = 0; i < fileInfo.size(); i++) {
if (!fileInfo[i].isDirectory) {
zl->Add(new GameButton(fileInfo[i].fullName, false, new UI::LinearLayoutParams(UI::FILL_PARENT, UI::WRAP_CONTENT)));
zl->Add(new GameButton(fileInfo[i].fullName, false, new UI::LinearLayoutParams(UI::FILL_PARENT, UI::WRAP_CONTENT)))->OnClick.Handle(this, &GameBrowser::GameButtonClick);
}
}
}
+1 -1
Submodule native updated: d20700d5bb...b0ab77d4c2.