1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 19:27:26 +08:00

Merge pull request #666 from smoogipooo/clr-vscode-debugging

Clr vscode debugging
This commit is contained in:
Dean Herbert 2017-04-22 23:36:36 +09:00 committed by GitHub
commit db72bfe03b
4 changed files with 35 additions and 8 deletions

11
.vscode/launch.json vendored
View File

@ -3,6 +3,9 @@
"configurations": [
{
"name": "Launch VisualTests",
"windows": {
"type": "clr"
},
"type": "mono",
"request": "launch",
"program": "${workspaceRoot}/osu.Desktop.VisualTests/bin/Debug/osu!.exe",
@ -15,6 +18,9 @@
},
{
"name": "Launch Desktop",
"windows": {
"type": "clr"
},
"type": "mono",
"request": "launch",
"program": "${workspaceRoot}/osu.Desktop/bin/Debug/osu!.exe",
@ -27,6 +33,11 @@
},
{
"name": "Attach",
"windows": {
"type": "clr",
"request": "attach",
"processName": "osu!"
},
"type": "mono",
"request": "attach",
"address": "localhost",

18
.vscode/tasks.json vendored
View File

@ -11,7 +11,23 @@
"command": "msbuild",
"args": [
// Ask msbuild to generate full paths for file names.
"/property:GenerateFullPaths=true"
"/property:GenerateFullPaths=true",
"/property:DebugType=portable"
],
// Use the standard MS compiler pattern to detect errors, warnings and infos
"problemMatcher": "$msCompile",
"isBuildCommand": true
},
{
"taskName": "rebuild",
"isShellCommand": true,
"showOutput": "silent",
"command": "msbuild",
"args": [
// Ask msbuild to generate full paths for file names.
"/property:GenerateFullPaths=true",
"/property:DebugType=portable",
"/target:Clean,Build"
],
// Use the standard MS compiler pattern to detect errors, warnings and infos
"problemMatcher": "$msCompile",

@ -1 +1 @@
Subproject commit b4e1b9a0eb1782ab8cfc48e305fd295a25c0579e
Subproject commit 9204b838504a51ffe7577c103b91270a2687bfb8

View File

@ -12,8 +12,8 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
{
protected override string Header => "Layout";
private OptionSlider<int> letterboxPositionX;
private OptionSlider<int> letterboxPositionY;
private OptionSlider<double> letterboxPositionX;
private OptionSlider<double> letterboxPositionY;
private Bindable<bool> letterboxing;
@ -35,15 +35,15 @@ namespace osu.Game.Overlays.Options.Sections.Graphics
LabelText = "Letterboxing",
Bindable = letterboxing,
},
letterboxPositionX = new OptionSlider<int>
letterboxPositionX = new OptionSlider<double>
{
LabelText = "Horizontal position",
Bindable = (BindableInt)config.GetBindable<int>(FrameworkConfig.LetterboxPositionX)
Bindable = config.GetBindable<double>(FrameworkConfig.LetterboxPositionX)
},
letterboxPositionY = new OptionSlider<int>
letterboxPositionY = new OptionSlider<double>
{
LabelText = "Vertical position",
Bindable = (BindableInt)config.GetBindable<int>(FrameworkConfig.LetterboxPositionY)
Bindable = config.GetBindable<double>(FrameworkConfig.LetterboxPositionY)
},
};