Skip to content

Commit

Permalink
new release to fix chat boxes on dark theme
Browse files Browse the repository at this point in the history
  • Loading branch information
@Icehunter
Icehunter committed May 26, 2021
1 parent ead1990 commit 7570c4f
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 91 deletions.
61 changes: 18 additions & 43 deletions XIVLOG/App.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,15 @@
ColorAdjustment="{materialDesign:ColorAdjustment}"
PrimaryColor="Cyan"
SecondaryColor="Purple" />
<ResourceDictionary
Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
<ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />
<!-- <ResourceDictionary Source="pack://application:,,,/MaterialDesignExtensions;component/Themes/Generic.xaml" /> -->

</ResourceDictionary.MergedDictionaries>

<Style x:Key="MaterialDesignTabControl" TargetType="{x:Type TabControl}">
<Setter Property="controls:TabControlAssist.TabHeaderHorizontalAlignment" Value="Left" />
<Setter Property="controls:TabControlAssist.TabHeaderHighlightBrush"
Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="controls:TabControlAssist.TabHeaderInactiveBrush"
Value="{DynamicResource MaterialDesignBodyLight}" />
<Setter Property="controls:TabControlAssist.TabHeaderHighlightBrush" Value="{DynamicResource PrimaryHueMidBrush}" />
<Setter Property="controls:TabControlAssist.TabHeaderInactiveBrush" Value="{DynamicResource MaterialDesignBodyLight}" />
<Setter Property="controls:TabControlAssist.TabHeaderInactiveOpacity" Value="1" />
<Setter Property="Background" Value="Transparent" />
<Setter Property="Template">
Expand All @@ -43,9 +40,7 @@
<ControlTemplate TargetType="{x:Type TabItem}">
<ControlTemplate.Resources>
<Storyboard x:Key="OnSelected">
<DoubleAnimationUsingKeyFrames
Storyboard.TargetName="clickBorder"
Storyboard.TargetProperty="Opacity">
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="clickBorder" Storyboard.TargetProperty="Opacity">
<DiscreteDoubleKeyFrame KeyTime="0" Value="0" />
<EasingDoubleKeyFrame KeyTime="0:0:0.15" Value="0.12">
<EasingDoubleKeyFrame.EasingFunction>
Expand All @@ -59,27 +54,21 @@
</EasingDoubleKeyFrame.EasingFunction>
</EasingDoubleKeyFrame>
</DoubleAnimationUsingKeyFrames>
<DoubleAnimationUsingKeyFrames
Storyboard.TargetName="clickBorder"
Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)">
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="clickBorder" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)">
<EasingDoubleKeyFrame KeyTime="0:0:0.0" Value="0" />
<EasingDoubleKeyFrame KeyTime="0:0:0.15" Value="1" />
</DoubleAnimationUsingKeyFrames>
<DoubleAnimationUsingKeyFrames
Storyboard.TargetName="clickBorder"
Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)">
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="clickBorder" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleY)">
<EasingDoubleKeyFrame KeyTime="0:0:0.0" Value="0" />
<EasingDoubleKeyFrame KeyTime="0:0:0.15" Value="1" />
</DoubleAnimationUsingKeyFrames>
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="border"
Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)">
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="border" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)">
<EasingDoubleKeyFrame KeyTime="0:0:0.0" Value="0" />
<EasingDoubleKeyFrame KeyTime="0:0:0.15" Value="1" />
</DoubleAnimationUsingKeyFrames>
</Storyboard>
<Storyboard x:Key="OnDeselected">
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="border"
Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)">
<DoubleAnimationUsingKeyFrames Storyboard.TargetName="border" Storyboard.TargetProperty="(UIElement.RenderTransform).(TransformGroup.Children)[0].(ScaleTransform.ScaleX)">
<EasingDoubleKeyFrame KeyTime="0:0:0.0" Value="1" />
<EasingDoubleKeyFrame KeyTime="0:0:0.15" Value="0" />
</DoubleAnimationUsingKeyFrames>
Expand Down Expand Up @@ -118,15 +107,10 @@
<ContentPresenter.Style>
<Style TargetType="ContentPresenter">
<Style.Triggers>
<DataTrigger
Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
Value="False">
<Setter Property="Opacity"
Value="{Binding Path=(controls:TabControlAssist.TabHeaderInactiveOpacity), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}}" />
<DataTrigger Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource TemplatedParent}}" Value="False">
<Setter Property="Opacity" Value="{Binding Path=(controls:TabControlAssist.TabHeaderInactiveOpacity), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}}" />
</DataTrigger>
<DataTrigger
Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource TemplatedParent}}"
Value="True">
<DataTrigger Binding="{Binding Path=IsSelected, RelativeSource={RelativeSource TemplatedParent}}" Value="True">
<Setter Property="Opacity" Value="1" />
</DataTrigger>
</Style.Triggers>
Expand All @@ -153,9 +137,7 @@
</Grid>
<ControlTemplate.Triggers>
<Trigger Property="IsSelected" Value="True">
<Setter
Property="controls:TabControlAssist.TabHeaderForeground"
Value="{Binding Path=(controls:TabControlAssist.TabHeaderHighlightBrush), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}}" />
<Setter Property="controls:TabControlAssist.TabHeaderForeground" Value="{Binding Path=(controls:TabControlAssist.TabHeaderHighlightBrush), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}}" />
<Trigger.EnterActions>
<BeginStoryboard Storyboard="{StaticResource OnSelected}" />
</Trigger.EnterActions>
Expand All @@ -164,9 +146,7 @@
</Trigger.ExitActions>
</Trigger>
<Trigger Property="IsSelected" Value="False">
<Setter
Property="controls:TabControlAssist.TabHeaderForeground"
Value="{Binding Path=(controls:TabControlAssist.TabHeaderInactiveBrush), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}}" />
<Setter Property="controls:TabControlAssist.TabHeaderForeground" Value="{Binding Path=(controls:TabControlAssist.TabHeaderInactiveBrush), RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type TabControl}}}" />
</Trigger>
<Trigger Property="IsEnabled" Value="False">
<Setter Property="Opacity" Value="0.23" />
Expand Down Expand Up @@ -250,40 +230,35 @@
<Setter TargetName="HeaderPanelBorder" Property="Margin" Value="2,0,2,2" />
<Setter TargetName="HeaderPanel" Property="Columns" Value="0" />
<Setter TargetName="HeaderPanel" Property="Rows" Value="1" />
<Setter TargetName="HeaderSeparatorBorder" Property="BorderThickness"
Value="0,0,0,1" />
<Setter TargetName="HeaderSeparatorBorder" Property="BorderThickness" Value="0,0,0,1" />
</Trigger>
<Trigger Property="TabStripPlacement" Value="Left">
<Setter TargetName="HeaderPanelBorder" Property="Grid.Row" Value="0" />
<Setter TargetName="PART_SelectedContentHostBorder" Property="Grid.Row" Value="0" />
<Setter TargetName="HeaderPanelBorder" Property="Grid.Column" Value="0" />
<Setter TargetName="PART_SelectedContentHostBorder" Property="Grid.Column"
Value="1" />
<Setter TargetName="PART_SelectedContentHostBorder" Property="Grid.Column" Value="1" />
<Setter TargetName="ColumnDefinition0" Property="Width" Value="Auto" />
<Setter TargetName="ColumnDefinition1" Property="Width" Value="*" />
<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
<Setter TargetName="HeaderPanelBorder" Property="Margin" Value="2,2,0,2" />
<Setter TargetName="HeaderPanel" Property="Columns" Value="1" />
<Setter TargetName="HeaderPanel" Property="Rows" Value="0" />
<Setter TargetName="HeaderSeparatorBorder" Property="BorderThickness"
Value="0,0,1,0" />
<Setter TargetName="HeaderSeparatorBorder" Property="BorderThickness" Value="0,0,1,0" />
</Trigger>
<Trigger Property="TabStripPlacement" Value="Right">
<Setter TargetName="HeaderPanelBorder" Property="Grid.Row" Value="0" />
<Setter TargetName="PART_SelectedContentHostBorder" Property="Grid.Row" Value="0" />
<Setter TargetName="HeaderPanelBorder" Property="Grid.Column" Value="1" />
<Setter TargetName="PART_SelectedContentHostBorder" Property="Grid.Column"
Value="0" />
<Setter TargetName="PART_SelectedContentHostBorder" Property="Grid.Column" Value="0" />
<Setter TargetName="ColumnDefinition0" Property="Width" Value="*" />
<Setter TargetName="ColumnDefinition1" Property="Width" Value="Auto" />
<Setter TargetName="RowDefinition0" Property="Height" Value="*" />
<Setter TargetName="RowDefinition1" Property="Height" Value="0" />
<Setter TargetName="HeaderPanelBorder" Property="Margin" Value="0,2,2,2" />
<Setter TargetName="HeaderPanel" Property="Columns" Value="1" />
<Setter TargetName="HeaderPanel" Property="Rows" Value="0" />
<Setter TargetName="HeaderSeparatorBorder" Property="BorderThickness"
Value="0,0,1,0" />
<Setter TargetName="HeaderSeparatorBorder" Property="BorderThickness" Value="0,0,1,0" />
</Trigger>
</ControlTemplate.Triggers>

Expand Down
3 changes: 1 addition & 2 deletions XIVLOG/Controls/StyledFlowDocument.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,10 @@
<FlowDocument
x:Name="_FD"
x:FieldModifier="public"
Background="{DynamicResource MaterialDesignPaper}"
Background="{DynamicResource MaterialDesignDarkBackground}"
ColumnWidth="9000"
FontFamily="Segoe UI"
FontSize="12"
Foreground="Black"
PagePadding="5, 0"
TextAlignment="Left">
<FlowDocument.Resources>
Expand Down
Loading

0 comments on commit 7570c4f

Please sign in to comment.