mirror of
https://github.com/Flow-Launcher/Flow.Launcher.git
synced 2026-03-11 08:54:32 +00:00
Adjust Inforbar
This commit is contained in:
DB p
parent
43330db969
commit
d1ceba7012
3 changed files with 307 additions and 3 deletions
78
Flow.Launcher/Resources/Controls/InfoBar.xaml
Normal file
78
Flow.Launcher/Resources/Controls/InfoBar.xaml
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
<UserControl
|
||||
x:Class="Flow.Launcher.Resources.Controls.InfoBar"
|
||||
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:converters="clr-namespace:Flow.Launcher.Converters"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:ui="http://schemas.modernwpf.com/2019"
|
||||
d:DesignHeight="45"
|
||||
d:DesignWidth="400"
|
||||
mc:Ignorable="d">
|
||||
<UserControl.Resources />
|
||||
<Grid>
|
||||
<Border
|
||||
x:Name="PART_Border"
|
||||
MinHeight="48"
|
||||
Padding="18 18 18 18"
|
||||
Background="{DynamicResource InfoBarInfoBG}"
|
||||
BorderBrush="{DynamicResource Color03B}"
|
||||
BorderThickness="1"
|
||||
CornerRadius="5">
|
||||
<Grid>
|
||||
<Grid.ColumnDefinitions>
|
||||
<ColumnDefinition Width="Auto" />
|
||||
<ColumnDefinition Width="*" />
|
||||
<ColumnDefinition Width="Auto" MinWidth="24" />
|
||||
</Grid.ColumnDefinitions>
|
||||
<StackPanel Grid.Column="0" Orientation="Horizontal">
|
||||
<Border
|
||||
x:Name="Part_IconBorder"
|
||||
Width="16" VerticalAlignment="Top"
|
||||
Height="16"
|
||||
Margin="0 0 12 0"
|
||||
CornerRadius="10">
|
||||
<ui:FontIcon
|
||||
x:Name="PART_Icon"
|
||||
Margin="1 0 0 1"
|
||||
VerticalAlignment="Center"
|
||||
FontFamily="Segoe MDL2 Assets"
|
||||
FontSize="13"
|
||||
Foreground="{DynamicResource Color01B}"
|
||||
Visibility="Visible" />
|
||||
</Border>
|
||||
|
||||
</StackPanel>
|
||||
<StackPanel
|
||||
x:Name="PART_StackPanel"
|
||||
Grid.Column="1"
|
||||
VerticalAlignment="Center"
|
||||
Orientation="Horizontal">
|
||||
<TextBlock
|
||||
x:Name="PART_Title"
|
||||
Margin="0 0 12 0"
|
||||
FontWeight="SemiBold"
|
||||
Foreground="{DynamicResource Color05B}"
|
||||
Text="{Binding Title}" />
|
||||
<TextBlock
|
||||
x:Name="PART_Message"
|
||||
Foreground="{DynamicResource Color05B}"
|
||||
Text="{Binding Message}"
|
||||
TextWrapping="Wrap" />
|
||||
</StackPanel>
|
||||
|
||||
<Button
|
||||
x:Name="PART_CloseButton"
|
||||
Grid.Column="2"
|
||||
Width="32"
|
||||
Height="32"
|
||||
VerticalAlignment="Center"
|
||||
Click="PART_CloseButton_Click"
|
||||
Content=""
|
||||
FontFamily="Segoe MDL2 Assets"
|
||||
FontSize="12"
|
||||
Visibility="Visible" />
|
||||
</Grid>
|
||||
</Border>
|
||||
</Grid>
|
||||
</UserControl>
|
||||
219
Flow.Launcher/Resources/Controls/InfoBar.xaml.cs
Normal file
219
Flow.Launcher/Resources/Controls/InfoBar.xaml.cs
Normal file
|
|
@ -0,0 +1,219 @@
|
|||
using System.Windows;
|
||||
using System.Windows.Controls;
|
||||
using System.Windows.Media;
|
||||
|
||||
namespace Flow.Launcher.Resources.Controls
|
||||
{
|
||||
public partial class InfoBar : UserControl
|
||||
{
|
||||
public InfoBar()
|
||||
{
|
||||
InitializeComponent();
|
||||
Loaded += InfoBar_Loaded;
|
||||
}
|
||||
|
||||
private void InfoBar_Loaded(object sender, RoutedEventArgs e)
|
||||
{
|
||||
UpdateStyle();
|
||||
UpdateTitleVisibility();
|
||||
UpdateMessageVisibility();
|
||||
UpdateOrientation();
|
||||
UpdateIconAlignmentAndMargin();
|
||||
|
||||
// DataContext 설정 (예시)
|
||||
this.DataContext = this; // InfoBar 자체를 DataContext로 사용
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty TypeProperty =
|
||||
DependencyProperty.Register(nameof(Type), typeof(InfoBarType), typeof(InfoBar), new PropertyMetadata(InfoBarType.Info, OnTypeChanged));
|
||||
|
||||
public InfoBarType Type
|
||||
{
|
||||
get => (InfoBarType)GetValue(TypeProperty);
|
||||
set => SetValue(TypeProperty, value);
|
||||
}
|
||||
|
||||
private static void OnTypeChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
if (d is InfoBar infoBar)
|
||||
{
|
||||
infoBar.UpdateStyle();
|
||||
}
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty MessageProperty =
|
||||
DependencyProperty.Register(nameof(Message), typeof(string), typeof(InfoBar), new PropertyMetadata(string.Empty, OnMessageChanged));
|
||||
|
||||
public string Message
|
||||
{
|
||||
get => (string)GetValue(MessageProperty);
|
||||
set
|
||||
{
|
||||
SetValue(MessageProperty, value);
|
||||
UpdateMessageVisibility(); // Message 속성 변경 시 Visibility 업데이트
|
||||
}
|
||||
}
|
||||
|
||||
private static void OnMessageChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
if (d is InfoBar infoBar)
|
||||
{
|
||||
infoBar.UpdateMessageVisibility();
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateMessageVisibility()
|
||||
{
|
||||
PART_Message.Visibility = string.IsNullOrEmpty(Message) ? Visibility.Collapsed : Visibility.Visible;
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty TitleProperty =
|
||||
DependencyProperty.Register(nameof(Title), typeof(string), typeof(InfoBar), new PropertyMetadata(string.Empty, OnTitleChanged));
|
||||
|
||||
public string Title
|
||||
{
|
||||
get => (string)GetValue(TitleProperty);
|
||||
set
|
||||
{
|
||||
SetValue(TitleProperty, value);
|
||||
UpdateTitleVisibility(); // Title 속성 변경 시 Visibility 업데이트
|
||||
}
|
||||
}
|
||||
|
||||
private static void OnTitleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
if (d is InfoBar infoBar)
|
||||
{
|
||||
infoBar.UpdateTitleVisibility();
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateTitleVisibility()
|
||||
{
|
||||
PART_Title.Visibility = string.IsNullOrEmpty(Title) ? Visibility.Collapsed : Visibility.Visible;
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty IsIconVisibleProperty =
|
||||
DependencyProperty.Register(nameof(IsIconVisible), typeof(bool), typeof(InfoBar), new PropertyMetadata(true, OnIsIconVisibleChanged));
|
||||
|
||||
public bool IsIconVisible
|
||||
{
|
||||
get => (bool)GetValue(IsIconVisibleProperty);
|
||||
set => SetValue(IsIconVisibleProperty, value);
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty LengthProperty =
|
||||
DependencyProperty.Register(nameof(Length), typeof(InfoBarLength), typeof(InfoBar), new PropertyMetadata(InfoBarLength.Short, OnLengthChanged));
|
||||
|
||||
public InfoBarLength Length
|
||||
{
|
||||
get { return (InfoBarLength)GetValue(LengthProperty); }
|
||||
set { SetValue(LengthProperty, value); }
|
||||
}
|
||||
|
||||
private static void OnLengthChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
if (d is InfoBar infoBar)
|
||||
{
|
||||
infoBar.UpdateOrientation();
|
||||
infoBar.UpdateIconAlignmentAndMargin();
|
||||
}
|
||||
}
|
||||
|
||||
private void UpdateOrientation()
|
||||
{
|
||||
PART_StackPanel.Orientation = Length == InfoBarLength.Long ? Orientation.Vertical : Orientation.Horizontal;
|
||||
}
|
||||
|
||||
private void UpdateIconAlignmentAndMargin()
|
||||
{
|
||||
if (Length == InfoBarLength.Short)
|
||||
{
|
||||
Part_IconBorder.VerticalAlignment = VerticalAlignment.Center;
|
||||
Part_IconBorder.Margin = new Thickness(0, 0, 12, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
Part_IconBorder.VerticalAlignment = VerticalAlignment.Top;
|
||||
Part_IconBorder.Margin = new Thickness(0, 2, 12, 0);
|
||||
}
|
||||
}
|
||||
|
||||
public static readonly DependencyProperty ClosableProperty =
|
||||
DependencyProperty.Register(nameof(Closable), typeof(bool), typeof(InfoBar), new PropertyMetadata(true, OnClosableChanged));
|
||||
|
||||
public bool Closable
|
||||
{
|
||||
get => (bool)GetValue(ClosableProperty);
|
||||
set => SetValue(ClosableProperty, value);
|
||||
}
|
||||
|
||||
private void PART_CloseButton_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Visibility = Visibility.Collapsed;
|
||||
}
|
||||
|
||||
private void UpdateStyle()
|
||||
{
|
||||
switch (Type)
|
||||
{
|
||||
case InfoBarType.Info:
|
||||
PART_Border.Background = (Brush)FindResource("InfoBarInfoBG");
|
||||
Part_IconBorder.Background = (Brush)FindResource("InfoBarInfoIcon");
|
||||
PART_Icon.Glyph = "\xF13F";
|
||||
break;
|
||||
case InfoBarType.Success:
|
||||
PART_Border.Background = (Brush)FindResource("InfoBarSuccessBG");
|
||||
Part_IconBorder.Background = (Brush)FindResource("InfoBarSuccessIcon");
|
||||
PART_Icon.Glyph = "\xF13E";
|
||||
break;
|
||||
case InfoBarType.Warning:
|
||||
PART_Border.Background = (Brush)FindResource("InfoBarWarningBG");
|
||||
Part_IconBorder.Background = (Brush)FindResource("InfoBarWarningIcon");
|
||||
PART_Icon.Glyph = "\xF13C";
|
||||
break;
|
||||
case InfoBarType.Error:
|
||||
PART_Border.Background = (Brush)FindResource("InfoBarErrorBG");
|
||||
Part_IconBorder.Background = (Brush)FindResource("InfoBarErrorIcon");
|
||||
PART_Icon.Glyph = "\xF13D";
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private static void OnIsIconVisibleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var infoBar = (InfoBar)d;
|
||||
infoBar.UpdateIconVisibility();
|
||||
}
|
||||
|
||||
private static void OnClosableChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
|
||||
{
|
||||
var infoBar = (InfoBar)d;
|
||||
infoBar.UpdateCloseButtonVisibility();
|
||||
}
|
||||
|
||||
private void UpdateIconVisibility()
|
||||
{
|
||||
Part_IconBorder.Visibility = IsIconVisible ? Visibility.Visible : Visibility.Collapsed;
|
||||
}
|
||||
|
||||
private void UpdateCloseButtonVisibility()
|
||||
{
|
||||
PART_CloseButton.Visibility = Closable ? Visibility.Visible : Visibility.Collapsed;
|
||||
}
|
||||
}
|
||||
|
||||
public enum InfoBarType
|
||||
{
|
||||
Info,
|
||||
Success,
|
||||
Warning,
|
||||
Error
|
||||
}
|
||||
|
||||
public enum InfoBarLength
|
||||
{
|
||||
Short,
|
||||
Long
|
||||
}
|
||||
}
|
||||
|
|
@ -32,13 +32,13 @@
|
|||
Title="Test"
|
||||
Closable="False"
|
||||
IsIconVisible="True"
|
||||
Length="Long"
|
||||
Length="Short"
|
||||
Message="This is a success message."
|
||||
Type="Info" />
|
||||
<cc:InfoBar
|
||||
Closable="True"
|
||||
IsIconVisible="True"
|
||||
Length="Long"
|
||||
Length="Short"
|
||||
Message="This is a success message."
|
||||
Type="Success" />
|
||||
<cc:InfoBar
|
||||
|
|
@ -46,7 +46,7 @@
|
|||
Closable="False"
|
||||
IsIconVisible="True"
|
||||
Length="Long"
|
||||
Message="This is a success message."
|
||||
Message="Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. Curabitur pretium"
|
||||
Type="Warning" />
|
||||
<cc:InfoBar
|
||||
Title="Test"
|
||||
|
|
@ -55,6 +55,13 @@
|
|||
Length="Short"
|
||||
Message="This is a success message."
|
||||
Type="Error" />
|
||||
<cc:InfoBar
|
||||
Title="Test"
|
||||
Closable="False"
|
||||
IsIconVisible="False"
|
||||
Length="Short"
|
||||
Message="This is a success message."
|
||||
Type="Error" />
|
||||
<cc:ExCard
|
||||
Title="{DynamicResource startFlowLauncherOnSystemStartup}"
|
||||
Margin="0 8 0 0"
|
||||
|
|
|
|||
Loading…
Reference in a new issue