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

Refactoring KeyVisual #31256

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
+353 −437
Open

Refactoring KeyVisual #31256

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a811dd3
Refactoring KeyVisual
niels9001 Jan 29, 2024
5fe5997
More refactoring
niels9001 Feb 1, 2024
d646e6e
Merge branch 'main' into niels9001/shortcut-keys-refactor
niels9001 Feb 2, 2024
3f895ee
More refactoring
niels9001 Feb 2, 2024
679d758
More refactoring
niels9001 Feb 2, 2024
5d4d7ed
Remove old styles
niels9001 Feb 2, 2024
4f68589
XAML styler
niels9001 Feb 2, 2024
3f5eb41
Updated brushes
niels9001 Feb 6, 2024
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
62 changes: 4 additions & 58 deletions src/settings-ui/Settings.UI/SettingsXAML/Controls/KeyVisual/KeyVisual.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,6 @@ public object Content

public static readonly DependencyProperty ContentProperty = DependencyProperty.Register("Content", typeof(object), typeof(KeyVisual), new PropertyMetadata(default(string), OnContentChanged));

public VisualType VisualType
{
get => (VisualType)GetValue(VisualTypeProperty);
set => SetValue(VisualTypeProperty, value);
}

public static readonly DependencyProperty VisualTypeProperty = DependencyProperty.Register("VisualType", typeof(VisualType), typeof(KeyVisual), new PropertyMetadata(default(VisualType), OnSizeChanged));

public bool IsError
{
get => (bool)GetValue(IsErrorProperty);
Expand All @@ -47,7 +39,6 @@ public bool IsError
public KeyVisual()
{
this.DefaultStyleKey = typeof(KeyVisual);
this.Style = GetStyleSize("TextKeyVisualStyle");
}

protected override void OnApplyTemplate()
Expand Down Expand Up @@ -88,13 +79,10 @@ private void Update()
{
if (_keyVisual.Content.GetType() == typeof(string))
{
_keyVisual.Style = GetStyleSize("TextKeyVisualStyle");
_keyVisual._keyPresenter.Content = _keyVisual.Content;
}
else
{
_keyVisual.Style = GetStyleSize("IconKeyVisualStyle");

switch ((int)_keyVisual.Content)
{
/* We can enable other glyphs in the future
Expand All @@ -116,15 +104,13 @@ private void Update()

case 91: // The left Windows key
case 92: // The right Windows key
PathIcon winIcon = XamlReader.Load(@"<PathIcon xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" Data=""M683 1229H0V546h683v683zm819 0H819V546h683v683zm-819 819H0v-683h683v683zm819 0H819v-683h683v683z"" />") as PathIcon;
Viewbox winIconContainer = new Viewbox();
PathIcon winIcon = XamlReader.Load(@"<PathIcon xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation"" Data=""M683 683H0V0H683V683ZM1502 683H819V0H1502V683ZM683 1502H0V819H683V1502ZM1502 1502H819V819H1502V1502Z"" />") as PathIcon;
Viewbox winIconContainer = new();
winIconContainer.Child = winIcon;
winIconContainer.MinWidth = 10;
winIconContainer.MaxWidth = this.FontSize;
winIconContainer.HorizontalAlignment = HorizontalAlignment.Center;
winIconContainer.VerticalAlignment = VerticalAlignment.Center;

double iconDimensions = GetIconSize();
winIconContainer.Height = iconDimensions;
winIconContainer.Width = iconDimensions;
_keyVisual._keyPresenter.Content = winIconContainer;
break;
default: _keyVisual._keyPresenter.Content = ((VirtualKey)_keyVisual.Content).ToString(); break;
Expand All @@ -133,38 +119,6 @@ private void Update()
}
}

public Style GetStyleSize(string styleName)
{
if (VisualType == VisualType.Small)
{
return (Style)App.Current.Resources["Small" + styleName];
}
else if (VisualType == VisualType.SmallOutline)
{
return (Style)App.Current.Resources["SmallOutline" + styleName];
}
else if (VisualType == VisualType.TextOnly)
{
return (Style)App.Current.Resources["Only" + styleName];
}
else
{
return (Style)App.Current.Resources["Default" + styleName];
}
}

public double GetIconSize()
{
if (VisualType == VisualType.Small || VisualType == VisualType.SmallOutline)
{
return (double)App.Current.Resources["SmallIconSize"];
}
else
{
return (double)App.Current.Resources["DefaultIconSize"];
}
}

private void KeyVisual_IsEnabledChanged(object sender, DependencyPropertyChangedEventArgs e)
{
SetEnabledState();
Expand All @@ -180,12 +134,4 @@ private void SetEnabledState()
VisualStateManager.GoToState(this, IsEnabled ? "Normal" : "Disabled", true);
}
}

public enum VisualType
{
Small,
SmallOutline,
TextOnly,
Large,
}
}
Loading
Loading