Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Settings UI] Represent Cursor Height as a slider #9386

Merged
2 commits merged into from
Mar 9, 2021
Merged

[Settings UI] Represent Cursor Height as a slider #9386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f78b21e
Change cursor height number box to slider
eugenesmlv Mar 5, 2021
d97a184
Restrict the minimum cursor height to 1px
eugenesmlv Mar 9, 2021
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
4 changes: 2 additions & 2 deletions doc/cascadia/profiles.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,9 +993,9 @@
"description": "Sets the color of the cursor. Overrides the cursor color from the color scheme. Uses hex color format: \"#rrggbb\"."
},
"cursorHeight": {
"description": "Sets the percentage height of the cursor starting from the bottom. Only works when cursorShape is set to \"vintage\". Accepts values from 25-100.",
"description": "Sets the percentage height of the cursor starting from the bottom. Only works when cursorShape is set to \"vintage\". Accepts values from 1-100.",
"maximum": 100,
"minimum": 25,
"minimum": 1,
"type": ["integer","null"],
"default": 25
},
Expand Down
20 changes: 14 additions & 6 deletions src/cascadia/TerminalSettingsEditor/Profiles.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,12 +318,20 @@ the MIT License. See LICENSE in the project root for license information. -->
ClearSettingValue="{x:Bind State.Profile.ClearCursorHeight}"
SettingOverrideSource="{x:Bind State.Profile.CursorHeightOverrideSource, Mode=OneWay}"
Visibility="{x:Bind IsVintageCursor, Mode=OneWay}">
<muxc:NumberBox Value="{x:Bind State.Profile.CursorHeight, Mode=TwoWay}"
Style="{StaticResource NumberBoxSettingStyle}"
Minimum="1"
Maximum="100"
SmallChange="1"
LargeChange="10"/>
<Grid Style="{StaticResource CustomSliderControlGridStyle}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Slider x:Name="CursorHeightSlider"
Grid.Column="0"
Minimum="1"
Maximum="100"
Value="{x:Bind State.Profile.CursorHeight, Mode=TwoWay}"/>
<TextBlock Grid.Column="1"
Text="{Binding ElementName=CursorHeightSlider, Path=Value, Mode=OneWay}"
Style="{StaticResource SliderValueLabelStyle}"/>
</Grid>
</local:SettingContainer>
</StackPanel>

Expand Down
2 changes: 2 additions & 0 deletions src/renderer/dx/CustomTextRenderer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,8 @@ try
// Enforce min/max cursor height
ULONG ulHeight = std::clamp(options.ulCursorHeightPercent, MinCursorHeightPercent, MaxCursorHeightPercent);
ulHeight = (glyphSize.height<ULONG>() * ulHeight) / 100;
ulHeight = std::max(ulHeight, MinCursorHeightPixels); // No smaller than 1px
Copy link
Contributor Author

Choose a reason for hiding this comment

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

@carlos-zamora, @zadjii-msft what if we restrict the minimum cursor height value to 1px? On values less than 25 the cursor is getting smaller until it reaches the 1px height. If one decreases the value further, it won't change anything.

If you think it's ok, I'll also update the docs.

Copy link
Member

Choose a reason for hiding this comment

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

I'm ok with that. 😊


rect.top = rect.bottom - ulHeight;
break;
}
Expand Down
3 changes: 2 additions & 1 deletion src/renderer/dx/CustomTextRenderer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ namespace Microsoft::Console::Render
Outline
};

constexpr const ULONG MinCursorHeightPercent = 25;
constexpr const ULONG MinCursorHeightPixels = 1;
constexpr const ULONG MinCursorHeightPercent = 1;
constexpr const ULONG MaxCursorHeightPercent = 100;

class CustomTextRenderer : public ::Microsoft::WRL::RuntimeClass<::Microsoft::WRL::RuntimeClassFlags<::Microsoft::WRL::ClassicCom | ::Microsoft::WRL::InhibitFtmBase>, IDWriteTextRenderer>
Expand Down