Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Two new properties should be added in the json settings file:

2. Both X value and Y values are optional. If any one of them is missing, or the value is invalid, system default value will be used. Examples:

"1000" equals (1000, 1000)
", 1000" equals (default, 1000)
"1000, " equals (1000, default)
"," equals (default, default)
Expand Down
3 changes: 1 addition & 2 deletions src/cascadia/LocalTests_TerminalApp/SettingsTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1618,5 +1618,4 @@ namespace TerminalAppLocalTests
VERIFY_ARE_EQUAL(true, termSettings->Elevate());
}
}

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ _TIL_INLINEPREFIX ::winrt::Microsoft::Terminal::Settings::Model::LaunchPosition
string,
[&initialPosition](int32_t left) { initialPosition.X = left; },
[&initialPosition](int32_t right) { initialPosition.Y = right; });
if (initialPosition.X && !initialPosition.Y && string.find(',') == std::string::npos)
{
initialPosition.Y = initialPosition.X;
}
Comment on lines +70 to +73
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why don't we modify ParseCommaSeparatedPair to do this for us?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I felt that function was more general purpose and could be reused elsewhere whereas the LaunchPositionFromString function is specifically for the initialPosition argument. Shall I modify ParseCommaSeparatedPair instead?

return initialPosition;
}

Expand Down
47 changes: 47 additions & 0 deletions src/cascadia/UnitTests_SettingsModel/TerminalSettingsTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include <pcg_random.hpp>

#include "../TerminalSettingsModel/CascadiaSettings.h"
#include "../TerminalSettingsModel/ModelSerializationHelpers.h"
#include "TestUtils.h"

using namespace Microsoft::Console;
Expand Down Expand Up @@ -52,6 +53,7 @@ namespace SettingsModelUnitTests
TEST_METHOD(MakeSettingsForDefaultProfileThatDoesntExist);
TEST_METHOD(TestLayerProfileOnColorScheme);
TEST_METHOD(TestCommandlineToTitlePromotion);
TEST_METHOD(TestInitialPositionParsing);
};

// CascadiaSettings::_normalizeCommandLine abuses some aspects from CommandLineToArgvW
Expand Down Expand Up @@ -891,4 +893,49 @@ namespace SettingsModelUnitTests
VERIFY_ARE_EQUAL(L"", settingsStruct.DefaultSettings()->StartingTitle());
}
}
void TerminalSettingsTests::TestInitialPositionParsing()
{
{
const auto pos = LaunchPositionFromString("50");
VERIFY_IS_TRUE(pos.X.Value());
VERIFY_IS_TRUE(pos.Y.Value());
VERIFY_ARE_EQUAL(50, static_cast<int32_t>(pos.X.Value()));
VERIFY_ARE_EQUAL(50, static_cast<int32_t>(pos.Y.Value()));
}

{
const auto pos = LaunchPositionFromString("100,");
VERIFY_IS_TRUE(pos.X.Value());
VERIFY_ARE_EQUAL(100, static_cast<int32_t>(pos.X.Value()));
VERIFY_IS_TRUE(pos.Y == nullptr);
}

{
const auto pos = LaunchPositionFromString(",100");
VERIFY_IS_TRUE(pos.X == nullptr);
VERIFY_IS_TRUE(pos.Y.Value());
VERIFY_ARE_EQUAL(100, static_cast<int32_t>(pos.Y.Value()));
}

{
const auto pos = LaunchPositionFromString("50,50");
VERIFY_IS_TRUE(pos.X.Value());
VERIFY_ARE_EQUAL(50, static_cast<int32_t>(pos.X.Value()));
VERIFY_IS_TRUE(pos.Y.Value());
VERIFY_ARE_EQUAL(50, static_cast<int32_t>(pos.Y.Value()));
}

{
const auto pos = LaunchPositionFromString("abc,100");
VERIFY_IS_TRUE(pos.X == nullptr);
VERIFY_IS_TRUE(pos.Y.Value());
VERIFY_ARE_EQUAL(100, static_cast<int32_t>(pos.Y.Value()));
}

{
const auto pos = LaunchPositionFromString("abc");
VERIFY_IS_TRUE(pos.X == nullptr);
VERIFY_IS_TRUE(pos.Y == nullptr);
}
}
}