Skip to content

Commit

Permalink
Tabs can't live in space and some other corrections.
Browse files Browse the repository at this point in the history
  • Loading branch information
@LunaMoo
LunaMoo committed Jan 17, 2016
1 parent 55903ce commit 80fa269
Show file tree
Hide file tree
Showing 3 changed files with 90 additions and 89 deletions.
9 changes: 5 additions & 4 deletions UI/DisplayLayoutScreen.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,6 @@ void DisplayLayoutScreen::CreateViews() {

I18NCategory *di = GetI18NCategory("Dialog");
I18NCategory *gr = GetI18NCategory("Graphics");
I18NCategory *cw = GetI18NCategory("CwCheats");

root_ = new AnchorLayout(new LayoutParams(FILL_PARENT, FILL_PARENT));

Expand All @@ -192,15 +191,17 @@ void DisplayLayoutScreen::CreateViews() {

Choice *back = new Choice(di->T("Back"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 10));
static const char *zoomLevels[] = { "Stretching", "Partial Stretch", "Auto Scaling", "Manual Scaling" };
zoom_ = new PopupMultiChoice(&g_Config.iSmallDisplayZoomType, cw->T("Options"), zoomLevels, 0, ARRAY_SIZE(zoomLevels), gr->GetName(), screenManager(), new AnchorLayoutParams(400, WRAP_CONTENT, local_dp_xres / 2 - 200, NONE, NONE, 10));
zoom_ = new PopupMultiChoice(&g_Config.iSmallDisplayZoomType, di->T("Options"), zoomLevels, 0, ARRAY_SIZE(zoomLevels), gr->GetName(), screenManager(), new AnchorLayoutParams(400, WRAP_CONTENT, local_dp_xres / 2 - 200, NONE, NONE, 10));
zoom_->OnChoice.Handle(this, &DisplayLayoutScreen::OnZoomTypeChange);

static const char *displayRotation[] = { "Landscape", "Portrait", "Landscape Reversed", "Portrait Reversed" };
rotation_ = new PopupMultiChoice(&g_Config.iInternalScreenRotation, gr->T("Rotation"), displayRotation, 1, ARRAY_SIZE(displayRotation), gr->GetName(), screenManager(), new AnchorLayoutParams(400, WRAP_CONTENT, local_dp_xres / 2 - 200, NONE, NONE, local_dp_yres - 64));
rotation_->SetEnabledPtr(&displayRotEnable_);
displayRotEnable_ = (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE);
bool bRotated = false;
if (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE && (g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL || g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL180)) { bRotated = true; }
if (displayRotEnable_ && (g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL || g_Config.iInternalScreenRotation == ROTATION_LOCKED_VERTICAL180)) {
bRotated = true;
}
mode_ = new ChoiceStrip(ORIENT_VERTICAL, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 158 + 64 + 10));
displayRepresentationScale_ = g_Config.fSmallDisplayZoomLevel * 8.0f; // Visual representation image is just icon size and have to be scaled 8 times to match PSP native resolution which is used as 1.0 for zoom
if (g_Config.iSmallDisplayZoomType > 1) { // Scaling
Expand Down Expand Up @@ -232,7 +233,7 @@ void DisplayLayoutScreen::CreateViews() {
Choice *center = new Choice(di->T("Center"), "", false, new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 74));
center->OnClick.Handle(this, &DisplayLayoutScreen::OnCenter);
root_->Add(center);
PopupSliderChoiceFloat *zoomlvl_ = new PopupSliderChoiceFloat(&g_Config.fSmallDisplayZoomLevel, 1.0f, 10.0f, di->T("Zoom"), 1.0f, screenManager(), "* PSP res", new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 134));
PopupSliderChoiceFloat *zoomlvl_ = new PopupSliderChoiceFloat(&g_Config.fSmallDisplayZoomLevel, 1.0f, 10.0f, di->T("Zoom"), 1.0f, screenManager(), di->T("* PSP res"), new AnchorLayoutParams(leftColumnWidth, WRAP_CONTENT, 10, NONE, NONE, 134));
root_->Add(zoomlvl_);
mode_->AddChoice(di->T("Move"));
mode_->AddChoice(di->T("Resize"));
Expand Down
168 changes: 84 additions & 84 deletions Windows/ppsspp.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,8 @@ BEGIN
CONTROL "",IDC_BREAKPOINTLIST,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER,1,338,513,93
CONTROL "Custom2",IDC_DEBUGMEMVIEW,"CtrlMemView",WS_BORDER,1,338,513,93
CONTROL "",IDC_THREADLIST,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER,1,338,513,93
CONTROL "",IDC_STACKFRAMES,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER,1,338,513,93
CONTROL "",IDC_MODULELIST,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER,1,338,513,93
CONTROL "",IDC_STACKFRAMES,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER,1,338,513,93
CONTROL "",IDC_MODULELIST,"SysListView32",LVS_ALIGNLEFT | LVS_SHOWSELALWAYS | LVS_REPORT | WS_BORDER,1,338,513,93
CONTROL "",IDC_DEBUG_BOTTOMTABS,"SysTabControl32",TCS_TABS | TCS_FOCUSNEVER,1,338,513,93
END

Expand Down Expand Up @@ -390,17 +390,17 @@ BEGIN
MENUITEM SEPARATOR

POPUP "Savestate Slot"
BEGIN
MENUITEM "&1", ID_FILE_SAVESTATE_SLOT_1
MENUITEM "&2", ID_FILE_SAVESTATE_SLOT_2
MENUITEM "&3", ID_FILE_SAVESTATE_SLOT_3
MENUITEM "&4", ID_FILE_SAVESTATE_SLOT_4
MENUITEM "&5", ID_FILE_SAVESTATE_SLOT_5
END
MENUITEM "Load State", ID_FILE_QUICKLOADSTATE
MENUITEM "Save State", ID_FILE_QUICKSAVESTATE
MENUITEM "Load State File...", ID_FILE_LOADSTATEFILE
MENUITEM "Save State File...", ID_FILE_SAVESTATEFILE
BEGIN
MENUITEM "&1", ID_FILE_SAVESTATE_SLOT_1
MENUITEM "&2", ID_FILE_SAVESTATE_SLOT_2
MENUITEM "&3", ID_FILE_SAVESTATE_SLOT_3
MENUITEM "&4", ID_FILE_SAVESTATE_SLOT_4
MENUITEM "&5", ID_FILE_SAVESTATE_SLOT_5
END
MENUITEM "Load State", ID_FILE_QUICKLOADSTATE
MENUITEM "Save State", ID_FILE_QUICKSAVESTATE
MENUITEM "Load State File...", ID_FILE_LOADSTATEFILE
MENUITEM "Save State File...", ID_FILE_SAVESTATEFILE
MENUITEM SEPARATOR
MENUITEM "Exit", ID_FILE_EXIT
END
Expand All @@ -411,13 +411,13 @@ BEGIN
MENUITEM "Stop", ID_EMULATION_STOP
MENUITEM "Reset", ID_EMULATION_RESET
MENUITEM "Switch UMD", ID_EMULATION_SWITCH_UMD
POPUP "Display Rotation"
BEGIN
MENUITEM "Landscape", ID_EMULATION_ROTATION_H
MENUITEM "Portrait", ID_EMULATION_ROTATION_V
MENUITEM "Landscape reversed", ID_EMULATION_ROTATION_H_R
MENUITEM "Portrait reversed", ID_EMULATION_ROTATION_V_R
END
POPUP "Display Rotation"
BEGIN
MENUITEM "Landscape", ID_EMULATION_ROTATION_H
MENUITEM "Portrait", ID_EMULATION_ROTATION_V
MENUITEM "Landscape reversed", ID_EMULATION_ROTATION_H_R
MENUITEM "Portrait reversed", ID_EMULATION_ROTATION_V_R
END
END

POPUP "Debug"
Expand Down Expand Up @@ -446,12 +446,12 @@ BEGIN
BEGIN
MENUITEM "Keep PPSSPP On Top", ID_OPTIONS_TOPMOST
MENUITEM "Pause When Not Focused", ID_OPTIONS_PAUSE_FOCUS
MENUITEM "Ignore Windows Key", ID_OPTIONS_IGNOREWINKEY
MENUITEM "Ignore Windows Key", ID_OPTIONS_IGNOREWINKEY
MENUITEM "More Settings...", ID_OPTIONS_MORE_SETTINGS
MENUITEM "Control Mapping...", ID_OPTIONS_CONTROLS
MENUITEM "Language...", ID_OPTIONS_LANGUAGE
MENUITEM SEPARATOR
MENUITEM "Display Layout Editor" ID_OPTIONS_DISPLAY_LAYOUT
MENUITEM "Display Layout Editor" ID_OPTIONS_DISPLAY_LAYOUT
MENUITEM "Fullscreen", ID_OPTIONS_FULLSCREEN
MENUITEM "VSync", ID_OPTIONS_VSYNC
MENUITEM "Postprocessing Shader", ID_OPTIONS_FXAA
Expand All @@ -477,45 +477,45 @@ BEGIN
MENUITEM "&4x", ID_OPTIONS_WINDOW4X
END

POPUP "Backend"
BEGIN
MENUITEM "Direct3D9" ID_OPTIONS_DIRECT3D9
MENUITEM "OpenGL" ID_OPTIONS_OPENGL
END

POPUP "Rendering Mode"
BEGIN
MENUITEM "Non-Buffered Rendering", ID_OPTIONS_NONBUFFEREDRENDERING
MENUITEM "Buffered Rendering", ID_OPTIONS_BUFFEREDRENDERING
MENUITEM "Read Framebuffers To Memory (CPU)", ID_OPTIONS_READFBOTOMEMORYCPU
MENUITEM "Read Framebuffers To Memory (GPU)", ID_OPTIONS_READFBOTOMEMORYGPU
END
POPUP "Frame Skipping"
BEGIN
MENUITEM "Auto", ID_OPTIONS_FRAMESKIP_AUTO
MENUITEM SEPARATOR
MENUITEM "Off", ID_OPTIONS_FRAMESKIP_0
MENUITEM "&1", ID_OPTIONS_FRAMESKIP_1
MENUITEM "&2", ID_OPTIONS_FRAMESKIP_2
MENUITEM "&3", ID_OPTIONS_FRAMESKIP_3
MENUITEM "&4", ID_OPTIONS_FRAMESKIP_4
MENUITEM "&5", ID_OPTIONS_FRAMESKIP_5
MENUITEM "&6", ID_OPTIONS_FRAMESKIP_6
MENUITEM "&7", ID_OPTIONS_FRAMESKIP_7
MENUITEM "&8", ID_OPTIONS_FRAMESKIP_8
END
POPUP "Texture Filtering"
BEGIN
MENUITEM "Auto", ID_OPTIONS_TEXTUREFILTERING_AUTO
MENUITEM "Nearest", ID_OPTIONS_NEARESTFILTERING
MENUITEM "Linear", ID_OPTIONS_LINEARFILTERING
MENUITEM "Linear on FMV", ID_OPTIONS_LINEARFILTERING_CG
END
POPUP "Screen Scaling Filter"
BEGIN
MENUITEM "Linear", ID_OPTIONS_BUFLINEARFILTER
MENUITEM "Nearest", ID_OPTIONS_BUFNEARESTFILTER
END
POPUP "Backend"
BEGIN
MENUITEM "Direct3D9" ID_OPTIONS_DIRECT3D9
MENUITEM "OpenGL" ID_OPTIONS_OPENGL
END

POPUP "Rendering Mode"
BEGIN
MENUITEM "Non-Buffered Rendering", ID_OPTIONS_NONBUFFEREDRENDERING
MENUITEM "Buffered Rendering", ID_OPTIONS_BUFFEREDRENDERING
MENUITEM "Read Framebuffers To Memory (CPU)", ID_OPTIONS_READFBOTOMEMORYCPU
MENUITEM "Read Framebuffers To Memory (GPU)", ID_OPTIONS_READFBOTOMEMORYGPU
END
POPUP "Frame Skipping"
BEGIN
MENUITEM "Auto", ID_OPTIONS_FRAMESKIP_AUTO
MENUITEM SEPARATOR
MENUITEM "Off", ID_OPTIONS_FRAMESKIP_0
MENUITEM "&1", ID_OPTIONS_FRAMESKIP_1
MENUITEM "&2", ID_OPTIONS_FRAMESKIP_2
MENUITEM "&3", ID_OPTIONS_FRAMESKIP_3
MENUITEM "&4", ID_OPTIONS_FRAMESKIP_4
MENUITEM "&5", ID_OPTIONS_FRAMESKIP_5
MENUITEM "&6", ID_OPTIONS_FRAMESKIP_6
MENUITEM "&7", ID_OPTIONS_FRAMESKIP_7
MENUITEM "&8", ID_OPTIONS_FRAMESKIP_8
END
POPUP "Texture Filtering"
BEGIN
MENUITEM "Auto", ID_OPTIONS_TEXTUREFILTERING_AUTO
MENUITEM "Nearest", ID_OPTIONS_NEARESTFILTERING
MENUITEM "Linear", ID_OPTIONS_LINEARFILTERING
MENUITEM "Linear on FMV", ID_OPTIONS_LINEARFILTERING_CG
END
POPUP "Screen Scaling Filter"
BEGIN
MENUITEM "Linear", ID_OPTIONS_BUFLINEARFILTER
MENUITEM "Nearest", ID_OPTIONS_BUFNEARESTFILTER
END

POPUP "Texture Scaling"
BEGIN
Expand All @@ -524,7 +524,7 @@ BEGIN
MENUITEM "&2x", ID_TEXTURESCALING_2X
MENUITEM "&3x", ID_TEXTURESCALING_3X
MENUITEM "&4x", ID_TEXTURESCALING_4X
MENUITEM "&5x", ID_TEXTURESCALING_5X
MENUITEM "&5x", ID_TEXTURESCALING_5X
MENUITEM SEPARATOR
MENUITEM "xBRZ", ID_TEXTURESCALING_XBRZ
MENUITEM "Hybrid", ID_TEXTURESCALING_HYBRID
Expand All @@ -533,7 +533,7 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Deposterize", ID_TEXTURESCALING_DEPOSTERIZE
END
MENUITEM "Hardware Transform", ID_OPTIONS_HARDWARETRANSFORM
MENUITEM "Hardware Transform", ID_OPTIONS_HARDWARETRANSFORM
MENUITEM "Vertex Cache", ID_OPTIONS_VERTEXCACHE
MENUITEM "Show FPS Counter", ID_OPTIONS_SHOWFPS
MENUITEM SEPARATOR
Expand Down Expand Up @@ -574,9 +574,9 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Kill Function", ID_DISASM_ADDHLE
MENUITEM "Rename Function...", ID_DISASM_RENAMEFUNCTION
MENUITEM "Remove Function", ID_DISASM_REMOVEFUNCTION
MENUITEM "Add Function Here", ID_DISASM_ADDFUNCTION
END
MENUITEM "Remove Function", ID_DISASM_REMOVEFUNCTION
MENUITEM "Add Function Here", ID_DISASM_ADDFUNCTION
END
POPUP "funclist"
BEGIN
MENUITEM "Kill Function", ID_FUNCLIST_KILLFUNCTION
Expand All @@ -593,24 +593,24 @@ BEGIN
BEGIN
MENUITEM "Disable", ID_CONTROLS_KEY_DISABLE
END
POPUP "breakpointlist"
BEGIN
MENUITEM "Enable", ID_DISASM_DISABLEBREAKPOINT
MENUITEM "Edit", ID_DISASM_EDITBREAKPOINT
POPUP "breakpointlist"
BEGIN
MENUITEM "Enable", ID_DISASM_DISABLEBREAKPOINT
MENUITEM "Edit", ID_DISASM_EDITBREAKPOINT
MENUITEM SEPARATOR
MENUITEM "Add New", ID_DISASM_ADDNEWBREAKPOINT
END
POPUP "threadlist"
BEGIN
MENUITEM "Force Resume", ID_DISASM_THREAD_FORCERUN
MENUITEM "Terminate", ID_DISASM_THREAD_KILL
END
POPUP "newbreakpoint"
BEGIN
MENUITEM "Add New", ID_DISASM_ADDNEWBREAKPOINT
END
POPUP "displaylistview"
BEGIN
MENUITEM "Add New", ID_DISASM_ADDNEWBREAKPOINT
END
POPUP "threadlist"
BEGIN
MENUITEM "Force Resume", ID_DISASM_THREAD_FORCERUN
MENUITEM "Terminate", ID_DISASM_THREAD_KILL
END
POPUP "newbreakpoint"
BEGIN
MENUITEM "Add New", ID_DISASM_ADDNEWBREAKPOINT
END
POPUP "displaylistview"
BEGIN
MENUITEM "Copy Address", ID_DISASM_COPYADDRESS
MENUITEM "Copy Instruction (Hex)", ID_DISASM_COPYINSTRUCTIONHEX
MENUITEM "Copy Instruction (Disasm)", ID_DISASM_COPYINSTRUCTIONDISASM
Expand All @@ -623,7 +623,7 @@ BEGIN
MENUITEM "Go to Displaylist PC", ID_GEDBG_GOTOPC
MENUITEM "Go to Address...", ID_GEDBG_GOTOADDR
MENUITEM "Go to in Memory View", ID_DISASM_GOTOINMEMORYVIEW
END
END
END

#endif // English (United States) resources
Expand Down
2 changes: 1 addition & 1 deletion Windows/resource.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 256
#define _APS_NEXT_COMMAND_VALUE 40152
#define _APS_NEXT_COMMAND_VALUE 40161
#define _APS_NEXT_CONTROL_VALUE 1199
#define _APS_NEXT_SYMED_VALUE 101
#endif
Expand Down

0 comments on commit 80fa269

Please sign in to comment.