Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-12 01:25:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1339 from raven02/patch-1

Browse Source 
Fix button spacing , control options overlay issue
This commit is contained in:
Henrik Rydgård 2013-04-19 02:19:07 -07:00
commit 641a0046a6
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
UI/MenuScreens.cpp
View File

@ -471,8 +471,8 @@ void SettingsScreen::render() {
screenManager()->finishDialog(this, DR_OK);
}
int w = LARGE_BUTTON_WIDTH - 10;
int s = 240;
int w = LARGE_BUTTON_WIDTH + 25;
int s = 280;
if (UIButton(GEN_ID, vlinear, w, 0, ms->T("Audio"), ALIGN_BOTTOMLEFT)) {
screenManager()->push(new AudioScreen());
@ -541,7 +541,6 @@ void DeveloperScreen::render() {
UIBegin(UIShader_Get());
DrawBackground(1.0f);
ui_draw2d.DrawText(UBUNTU48, "Developer Tools", dp_xres / 2, 20, 0xFFFFFFFF, ALIGN_HCENTER);
VLinear vlinear(50, 100, 20);
int w = 400;
@ -549,6 +548,8 @@ void DeveloperScreen::render() {
I18NCategory *g = GetI18NCategory("General");
I18NCategory *d = GetI18NCategory("Developer");
ui_draw2d.DrawText(UBUNTU48, d->T("Developer Tools"), dp_xres / 2, 20, 0xFFFFFFFF, ALIGN_HCENTER);
if (UIButton(GEN_ID, Pos(dp_xres - 10, dp_yres-10), LARGE_BUTTON_WIDTH, 0, g->T("Back"), ALIGN_RIGHT | ALIGN_BOTTOM)) {
screenManager()->finishDialog(this, DR_OK);
}
@ -678,7 +679,7 @@ void SystemScreen::render() {
UICheckBox(GEN_ID, x, y += stride, s->T("Show Debug Statistics"), ALIGN_TOPLEFT, &g_Config.bShowDebugStats);
UICheckBox(GEN_ID, x, y += stride, s->T("Show FPS"), ALIGN_TOPLEFT, &g_Config.bShowFPSCounter);
VGrid vlang(550, 100, dp_yres - 50, 10, 10);
VGrid vlang(530, 100, dp_yres - 50, 10, 10);
for (int i = 0; i < langs_.size(); i++) {
std::string code;
@ -728,12 +729,10 @@ void ControlsScreen::render() {
UICheckBox(GEN_ID, x, y += stride, c->T("OnScreen", "On-Screen Touch Controls"), ALIGN_TOPLEFT, &g_Config.bShowTouchControls);
if (g_Config.bShowTouchControls) {
UICheckBox(GEN_ID, x + columnw, y, c->T("Large Controls"), ALIGN_TOPLEFT, &g_Config.bLargeControls);
UICheckBox(GEN_ID, x + columnw, y += stride, c->T("Show Analog Stick"), ALIGN_TOPLEFT, &g_Config.bShowAnalogStick);
} else {
y += stride;
}
UICheckBox(GEN_ID, x, y, c->T("Tilt", "Tilt to Analog (horizontal)"), ALIGN_TOPLEFT, &g_Config.bAccelerometerToAnalogHoriz);
UICheckBox(GEN_ID, x, y += stride, c->T("Large Controls"), ALIGN_TOPLEFT, &g_Config.bLargeControls);
UICheckBox(GEN_ID, x, y += stride, c->T("Show Analog Stick"), ALIGN_TOPLEFT, &g_Config.bShowAnalogStick);
}
UICheckBox(GEN_ID, x, y += stride, c->T("Tilt", "Tilt to Analog (horizontal)"), ALIGN_TOPLEFT, &g_Config.bAccelerometerToAnalogHoriz);
UIEnd();
}

9
lang/ja_JA.ini
View File

@ -1,10 +1,11 @@
[MainMenu]
[MainMenu]
Credits = クレジット
Exit = 終了
Load = ロード...
Settings = 設定
Recent = 最近
[Developer]
Developer Tools = 開発者のみの設定
Dump frame to log = ログでフレームをダンプ
Load language ini = 言語設定をロード
Run CPU tests = CPUテストを実行
@ -24,11 +25,11 @@ Settings = 設定
System = 本体
SystemDesc = パフォーマンス設定と情報表示
[System]
System Settings = 本体設定
Dynarec = 動的再コンパイル(JIT)
Fast Memory = 高速メモリ (不安定)
Show Debug Statistics = デバッグ情報を表示
Show FPS = FPSを表示
System Settings = 本体設定
[Audio]
Audio Settings = オーディオ設定
Enable Sound = オーディオを有効
@ -36,11 +37,13 @@ Enable Sound = オーディオを有効
Controls Settings = コントロールの設定
OnScreen = 画面でのタッチコントロールを有効
Tilt = アナログ代わりに加速度計を使う(横)
Large Controls = 大きなサイズの制御
Show Analog Stick = Analog Stickを表示
[Graphics]
Graphics Settings = グラフィックス設定
2X = 解像度を二倍
Buffered Rendering = レンダリングをバッファ
Frame Skipping = フレームをスキップ
Graphics Settings = グラフィックス設定
Hardware Transform = ハードウェアで変換
Linear Filtering = 線形フィルタ
Media Engine = メディアエンジン