Minor UI tweak

This commit is contained in:
Henrik Rydgård 2013-10-31 13:34:34 +01:00
parent bc63867f1d
commit ebfc706e46
3 changed files with 8 additions and 4 deletions

View File

@ -378,7 +378,7 @@ void GameBrowser::Refresh() {
if (allowBrowsing_) {
LinearLayout *topBar = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
Margins pathMargins(5, 0);
topBar->Add(new TextView(path_.GetFriendlyPath().c_str(), ALIGN_VCENTER, 0.7f, new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT, 1.0f, pathMargins)));
topBar->Add(new TextView(path_.GetFriendlyPath().c_str(), ALIGN_VCENTER, true, new LinearLayoutParams(WRAP_CONTENT, FILL_PARENT, 1.0f, pathMargins)));
#if defined(_WIN32)
topBar->Add(new Choice(m->T("Browse", "Browse...")))->OnClick.Handle(this, &GameBrowser::HomeClick);
#else
@ -568,7 +568,11 @@ void MainScreen::CreateViews() {
#ifndef __SYMBIAN32__
rightColumnItems->Add(new Choice(m->T("www.ppsspp.org")))->OnClick.Handle(this, &MainScreen::OnPPSSPPOrg);
#endif
rightColumnItems->Add(new Choice(m->T("Support PPSSPP")))->OnClick.Handle(this, &MainScreen::OnSupport);
#ifndef GOLD
Choice *gold = rightColumnItems->Add(new Choice(m->T("Support PPSSPP")));
gold->OnClick.Handle(this, &MainScreen::OnSupport);
gold->SetIcon(I_ICONGOLD);
#endif
rightColumnItems->Add(new Choice(m->T("Exit")))->OnClick.Handle(this, &MainScreen::OnExit);
if (vertical) {
root_ = new LinearLayout(ORIENT_VERTICAL);

View File

@ -357,7 +357,7 @@ DragDropButton *TouchControlLayoutScreen::getPickedControl(const int x, const in
for (size_t i = 0; i < controls_.size(); i++) {
DragDropButton *control = controls_[i];
const Bounds &bounds = control->GetBounds();
static const int thresholdFactor = 1.5;
const float thresholdFactor = 1.5f;
Bounds tolerantBounds(bounds.x, bounds.y, bounds.w * thresholdFactor, bounds.h * thresholdFactor);
if (tolerantBounds.Contains(x, y)) {

2
native

@ -1 +1 @@
Subproject commit cff2711a7c087edea398ae98dd245ae094bc17c6
Subproject commit c4807fbfb89e7988cb43a54c939eca936da81704