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.

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

New control: Marquee #514

Merged
merged 7 commits into from
Dec 18, 2024
Merged
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
54 changes: 54 additions & 0 deletions demo/Ursa.Demo/Pages/MarqueeDemo.axaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
<UserControl
x:Class="Ursa.Demo.Pages.MarqueeDemo"
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:u="https://irihi.tech/ursa"
d:DesignHeight="450"
d:DesignWidth="800"
mc:Ignorable="d">
<StackPanel>
<u:Form>
<TextBox Width="300" Name="content" u:FormItem.Label="Content" Text="Hello Avalonia"></TextBox>
<u:EnumSelector
u:FormItem.Label="Direction"
Name="direction"
EnumType="{x:Type u:Direction}"
Value="{x:Static u:Direction.Left}" />
<u:EnumSelector
Name="horizontal"
u:FormItem.Label="HorizontalContentAlignment"
EnumType="{x:Type HorizontalAlignment}"
Value="{x:Static HorizontalAlignment.Center}" />
<u:EnumSelector
Name="vertical"
u:FormItem.Label="VerticalContentAlignment"
EnumType="{x:Type VerticalAlignment}"
Value="{x:Static VerticalAlignment.Center}" />
<u:NumericDoubleUpDown
Name="speed"
AllowDrag="True"
u:FormItem.Label="Speed"
Minimum="-100"
Maximum="300"
Value="60"/>
<ToggleSwitch
Name="running"
u:FormItem.Label="IsRunning"
IsChecked="True" />
</u:Form>

<u:Marquee
Height="100"
HorizontalContentAlignment="{Binding #horizontal.Value}"
VerticalContentAlignment="{Binding #vertical.Value}"
Speed="{Binding #speed.Value}"
Background="{DynamicResource SemiBlue1}"
Direction="{Binding #direction.Value}"
Content="{Binding #content.Text}"
IsRunning="{Binding #running.IsChecked}">

</u:Marquee>
</StackPanel>
</UserControl>
13 changes: 13 additions & 0 deletions demo/Ursa.Demo/Pages/MarqueeDemo.axaml.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Markup.Xaml;

namespace Ursa.Demo.Pages;

public partial class MarqueeDemo : UserControl
{
public MarqueeDemo()
{
InitializeComponent();
}
}
1 change: 1 addition & 0 deletions demo/Ursa.Demo/ViewModels/MainViewViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ private void OnNavigation(MainViewViewModel vm, string s)
MenuKeys.MenuKeyIpBox => new IPv4BoxDemoViewModel(),
MenuKeys.MenuKeyKeyGestureInput => new KeyGestureInputDemoViewModel(),
MenuKeys.MenuKeyLoading => new LoadingDemoViewModel(),
MenuKeys.MenuKeyMarquee => new MarqueeDemoViewModel(),
MenuKeys.MenuKeyMessageBox => new MessageBoxDemoViewModel(),
MenuKeys.MenuKeyMultiComboBox => new MultiComboBoxDemoViewModel(),
MenuKeys.MenuKeyNavMenu => new NavMenuDemoViewModel(),
Expand Down
8 changes: 8 additions & 0 deletions demo/Ursa.Demo/ViewModels/MarqueeDemoViewModel.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
using CommunityToolkit.Mvvm.ComponentModel;

namespace Ursa.Demo.ViewModels;

public class MarqueeDemoViewModel: ViewModelBase
{

}
2 changes: 2 additions & 0 deletions demo/Ursa.Demo/ViewModels/MenuViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public MenuViewModel()
new() { MenuHeader = "IPv4Box", Key = MenuKeys.MenuKeyIpBox },
new() { MenuHeader = "KeyGestureInput", Key = MenuKeys.MenuKeyKeyGestureInput },
new() { MenuHeader = "Loading", Key = MenuKeys.MenuKeyLoading },
new() { MenuHeader = "Marquee", Key = MenuKeys.MenuKeyMarquee },
new() { MenuHeader = "Message Box", Key = MenuKeys.MenuKeyMessageBox },
new() { MenuHeader = "MultiComboBox", Key = MenuKeys.MenuKeyMultiComboBox, Status = "Updated" },
new() { MenuHeader = "Nav Menu", Key = MenuKeys.MenuKeyNavMenu },
Expand Down Expand Up @@ -89,6 +90,7 @@ public static class MenuKeys
public const string MenuKeyIpBox = "IPv4Box";
public const string MenuKeyKeyGestureInput = "KeyGestureInput";
public const string MenuKeyLoading = "Loading";
public const string MenuKeyMarquee = "Marquee";
public const string MenuKeyMessageBox = "MessageBox";
public const string MenuKeyMultiComboBox = "MultiComboBox";
public const string MenuKeyNavMenu = "NavMenu";
Expand Down
26 changes: 26 additions & 0 deletions src/Ursa.Themes.Semi/Controls/Marquee.axaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<ResourceDictionary
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:iri="https://irihi.tech/shared"
xmlns:u="https://irihi.tech/ursa">
<!-- Add Resources Here -->
<ControlTheme x:Key="{x:Type u:Marquee}" TargetType="u:Marquee">
<Setter Property="Template">
<ControlTemplate>
<Border
Background="{TemplateBinding Background}"
BackgroundSizing="{TemplateBinding BackgroundSizing}"
BorderBrush="{TemplateBinding BorderBrush}"
CornerRadius="{TemplateBinding CornerRadius}"
BorderThickness="{TemplateBinding BorderThickness}">
<Canvas>
<ContentPresenter
Name="{x:Static iri:PartNames.PART_ContentPresenter}"
Content="{TemplateBinding Content}"
ContentTemplate="{TemplateBinding ContentTemplate}" />
</Canvas>
</Border>
</ControlTemplate>
</Setter>
</ControlTheme>
</ResourceDictionary>
1 change: 1 addition & 0 deletions src/Ursa.Themes.Semi/Controls/_index.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
<ResourceInclude Source="IPv4Box.axaml" />
<ResourceInclude Source="KeyGestureInput.axaml" />
<ResourceInclude Source="Loading.axaml" />
<ResourceInclude Source="Marquee.axaml" />
<ResourceInclude Source="MessageBox.axaml" />
<ResourceInclude Source="MultiComboBox.axaml" />
<ResourceInclude Source="NavMenu.axaml" />
Expand Down
11 changes: 11 additions & 0 deletions src/Ursa/Controls/Marquee/Direction.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
using Avalonia.Controls;

namespace Ursa.Controls;

public enum Direction
{
Left,
Right,
Up,
Down,
}
Loading
Loading