From fb82cfd2584d06956b7f99e7641d3906a07c25f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Rydg=C3=A5rd?= Date: Wed, 23 Apr 2014 21:17:53 +0200 Subject: [PATCH] Revert "Merge pull request #5939 from raven02/patch-18" This reverts commit cf267abc82c7d98678e4d97d961318fb71f6315d, reversing changes made to 97c18e7f0ec92fc2a4c61743240ee4e9a8cf264e. --- Core/Dialog/PSPOskDialog.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Core/Dialog/PSPOskDialog.cpp b/Core/Dialog/PSPOskDialog.cpp index a5a466365..2510e715b 100755 --- a/Core/Dialog/PSPOskDialog.cpp +++ b/Core/Dialog/PSPOskDialog.cpp @@ -874,23 +874,22 @@ int PSPOskDialog::Update(int animSpeed) { I18NCategory *d = GetI18NCategory("Dialog"); - PPGeDrawImage(I_SQUARE, 365, 220, 20, 20, 0, CalcFadedColor(0xFFFFFFFF)); - PPGeDrawText(d->T("Space"), 395, 220, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawImage(I_SQUARE, 85, 195, 20, 20, 0, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText(d->T("Space"), 115, 195, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); if (g_Config.iButtonPreference != PSP_SYSTEMPARAM_BUTTON_CIRCLE) { - PPGeDrawImage(I_CROSS, 45, 220, 20, 20, 0, CalcFadedColor(0xFFFFFFFF)); - PPGeDrawImage(I_CIRCLE, 45, 245, 20, 20, 0, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawImage(I_CROSS, 85, 220, 20, 20, 0, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawImage(I_CIRCLE, 85, 245, 20, 20, 0, CalcFadedColor(0xFFFFFFFF)); } else { - PPGeDrawImage(I_CIRCLE, 45, 220, 20, 20, 0, CalcFadedColor(0xFFFFFFFF)); - PPGeDrawImage(I_CROSS, 45, 245, 20, 20, 0, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawImage(I_CIRCLE, 85, 220, 20, 20, 0, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawImage(I_CROSS, 85, 245, 20, 20, 0, CalcFadedColor(0xFFFFFFFF)); } - PPGeDrawText(d->T("Select"), 75, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); - PPGeDrawText(d->T("Delete"), 75, 247, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); - - PPGeDrawText("Start", 135, 220, PPGE_ALIGN_LEFT, 0.6f, CalcFadedColor(0xFFFFFFFF)); - PPGeDrawText(d->T("Finish"), 185, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText(d->T("Select"), 115, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText(d->T("Delete"), 115, 247, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText("Start", 195, 220, PPGE_ALIGN_LEFT, 0.6f, CalcFadedColor(0xFFFFFFFF)); + PPGeDrawText(d->T("Finish"), 235, 222, PPGE_ALIGN_LEFT, 0.5f, CalcFadedColor(0xFFFFFFFF)); int index = (currentKeyboardLanguage - 1) % OSK_LANGUAGE_COUNT; const char *countryCode;