mirror of
https://github.com/ChrisTitusTech/winutil.git
synced 2024-11-15 07:05:51 -06:00
ui fixes
- better coloring for scrollbar - better styling for tooltip - better styling for menuitem - change max window size on startup to correctly display install tab
This commit is contained in:
parent
81aead7a68
commit
d8f817668b
@ -40,6 +40,9 @@
|
|||||||
"LinkHoverForegroundColor": "#232629",
|
"LinkHoverForegroundColor": "#232629",
|
||||||
"GroupBorderBackgroundColor": "#232629",
|
"GroupBorderBackgroundColor": "#232629",
|
||||||
"ComboBoxForegroundColor": "#232629",
|
"ComboBoxForegroundColor": "#232629",
|
||||||
|
"ScrollBarBackgroundColor": "#4A4D52",
|
||||||
|
"ScrollBarHoverColor": "#2E3135",
|
||||||
|
"ScrollBarDraggingColor": "#3A3D42",
|
||||||
|
|
||||||
"ButtonFontSize": "12",
|
"ButtonFontSize": "12",
|
||||||
"ButtonFontFamily": "Arial",
|
"ButtonFontFamily": "Arial",
|
||||||
@ -85,6 +88,9 @@
|
|||||||
"LinkHoverForegroundColor": "#232629",
|
"LinkHoverForegroundColor": "#232629",
|
||||||
"GroupBorderBackgroundColor": "#232629",
|
"GroupBorderBackgroundColor": "#232629",
|
||||||
"ComboBoxForegroundColor": "#232629",
|
"ComboBoxForegroundColor": "#232629",
|
||||||
|
"ScrollBarBackgroundColor": "#4A4D52",
|
||||||
|
"ScrollBarHoverColor": "#2E3135",
|
||||||
|
"ScrollBarDraggingColor": "#3A3D42",
|
||||||
|
|
||||||
"ButtonInstallBackgroundColor": "#F7F7F7",
|
"ButtonInstallBackgroundColor": "#F7F7F7",
|
||||||
"ButtonTweaksBackgroundColor": "#F7F7F7",
|
"ButtonTweaksBackgroundColor": "#F7F7F7",
|
||||||
@ -111,6 +117,9 @@
|
|||||||
"LinkForegroundColor": "#add8e6",
|
"LinkForegroundColor": "#add8e6",
|
||||||
"LinkHoverForegroundColor": "#F7F7F7",
|
"LinkHoverForegroundColor": "#F7F7F7",
|
||||||
"ComboBoxForegroundColor": "#81a1c1",
|
"ComboBoxForegroundColor": "#81a1c1",
|
||||||
|
"ScrollBarBackgroundColor": "#2E3135",
|
||||||
|
"ScrollBarHoverColor": "#3B4252",
|
||||||
|
"ScrollBarDraggingColor": "#5E81AC",
|
||||||
|
|
||||||
"ProgressBarForegroundColor": "#222222",
|
"ProgressBarForegroundColor": "#222222",
|
||||||
"ProgressBarBackgroundColor": "Transparent",
|
"ProgressBarBackgroundColor": "Transparent",
|
||||||
@ -144,6 +153,9 @@
|
|||||||
"LinkForegroundColor": "#add8e6",
|
"LinkForegroundColor": "#add8e6",
|
||||||
"LinkHoverForegroundColor": "#F7F7F7",
|
"LinkHoverForegroundColor": "#F7F7F7",
|
||||||
"ComboBoxForegroundColor": "#f7f7f7",
|
"ComboBoxForegroundColor": "#f7f7f7",
|
||||||
|
"ScrollBarBackgroundColor": "#2E3135",
|
||||||
|
"ScrollBarHoverColor": "#3B4252",
|
||||||
|
"ScrollBarDraggingColor": "#5E81AC",
|
||||||
|
|
||||||
"ProgressBarForegroundColor": "#222222",
|
"ProgressBarForegroundColor": "#222222",
|
||||||
"ProgressBarBackgroundColor": "Transparent",
|
"ProgressBarBackgroundColor": "Transparent",
|
||||||
|
@ -11,13 +11,36 @@
|
|||||||
WindowStyle="None"
|
WindowStyle="None"
|
||||||
Width="Auto"
|
Width="Auto"
|
||||||
Height="Auto"
|
Height="Auto"
|
||||||
MaxWidth="1280"
|
MaxWidth="1380"
|
||||||
MaxHeight="800"
|
MaxHeight="800"
|
||||||
Title="Chris Titus Tech's Windows Utility">
|
Title="Chris Titus Tech's Windows Utility">
|
||||||
<WindowChrome.WindowChrome>
|
<WindowChrome.WindowChrome>
|
||||||
<WindowChrome CaptionHeight="0" CornerRadius="10"/>
|
<WindowChrome CaptionHeight="0" CornerRadius="10"/>
|
||||||
</WindowChrome.WindowChrome>
|
</WindowChrome.WindowChrome>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
|
<Style TargetType="ToolTip">
|
||||||
|
<Setter Property="Background" Value="{MainBackgroundColor}"/>
|
||||||
|
<Setter Property="Foreground" Value="{MainForegroundColor}"/>
|
||||||
|
<Setter Property="BorderBrush" Value="{ButtonBackgroundSelectedColor}"/>
|
||||||
|
<Setter Property="BorderThickness" Value="1"/>
|
||||||
|
<Setter Property="Padding" Value="5"/>
|
||||||
|
<Setter Property="FontSize" Value="{FontSize}"/>
|
||||||
|
<Setter Property="FontFamily" Value="{FontFamily}"/>
|
||||||
|
</Style>
|
||||||
|
<ItemsPanelTemplate x:Key="MenuItemPanelTemplate">
|
||||||
|
<StackPanel Margin="-20,0,0,0" Background="{MainBackgroundColor}"/>
|
||||||
|
</ItemsPanelTemplate>
|
||||||
|
|
||||||
|
<Style TargetType="{x:Type MenuItem}">
|
||||||
|
<Setter Property="Background" Value="{MainBackgroundColor}"/>
|
||||||
|
<Setter Property="Foreground" Value="{MainForegroundColor}"/>
|
||||||
|
<Setter Property="FontSize" Value="{FontSize}"/>
|
||||||
|
<Setter Property="FontFamily" Value="{FontFamily}"/>
|
||||||
|
<Setter Property="Padding" Value="5,2,5,2"/>
|
||||||
|
<Setter Property="BorderThickness" Value="0"/>
|
||||||
|
<Setter Property="ItemsPanel" Value="{StaticResource MenuItemPanelTemplate}"/>
|
||||||
|
</Style>
|
||||||
|
|
||||||
<!--Scrollbar Thumbs-->
|
<!--Scrollbar Thumbs-->
|
||||||
<Style x:Key="ScrollThumbs" TargetType="{x:Type Thumb}">
|
<Style x:Key="ScrollThumbs" TargetType="{x:Type Thumb}">
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
@ -77,7 +100,7 @@
|
|||||||
<!--ScrollBars-->
|
<!--ScrollBars-->
|
||||||
<Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
|
<Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}">
|
||||||
<Setter Property="Stylus.IsFlicksEnabled" Value="false" />
|
<Setter Property="Stylus.IsFlicksEnabled" Value="false" />
|
||||||
<Setter Property="Foreground" Value="{MainForegroundColor}" />
|
<Setter Property="Foreground" Value="{ScrollBarBackgroundColor}" />
|
||||||
<Setter Property="Background" Value="{MainBackgroundColor}" />
|
<Setter Property="Background" Value="{MainBackgroundColor}" />
|
||||||
<Setter Property="Width" Value="6" />
|
<Setter Property="Width" Value="6" />
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
@ -103,10 +126,10 @@
|
|||||||
|
|
||||||
<ControlTemplate.Triggers>
|
<ControlTemplate.Triggers>
|
||||||
<Trigger SourceName="Thumb" Property="IsMouseOver" Value="true">
|
<Trigger SourceName="Thumb" Property="IsMouseOver" Value="true">
|
||||||
<Setter Value="{ButtonBackgroundMouseoverColor}" TargetName="Thumb" Property="Background" />
|
<Setter Value="{ScrollBarHoverColor}" TargetName="Thumb" Property="Background" />
|
||||||
</Trigger>
|
</Trigger>
|
||||||
<Trigger SourceName="Thumb" Property="IsDragging" Value="true">
|
<Trigger SourceName="Thumb" Property="IsDragging" Value="true">
|
||||||
<Setter Value="{ButtonBackgroundSelectedColor}" TargetName="Thumb" Property="Background" />
|
<Setter Value="{ScrollBarDraggingColor}" TargetName="Thumb" Property="Background" />
|
||||||
</Trigger>
|
</Trigger>
|
||||||
|
|
||||||
<Trigger Property="IsEnabled" Value="false">
|
<Trigger Property="IsEnabled" Value="false">
|
||||||
@ -577,6 +600,15 @@
|
|||||||
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
<Setter Property="HorizontalAlignment" Value="Stretch"/>
|
||||||
<Setter Property="VerticalAlignment" Value="Center"/>
|
<Setter Property="VerticalAlignment" Value="Center"/>
|
||||||
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
|
<Setter Property="HorizontalContentAlignment" Value="Stretch"/>
|
||||||
|
<Setter Property="ContextMenu">
|
||||||
|
<Setter.Value>
|
||||||
|
<ContextMenu>
|
||||||
|
<MenuItem Command="Cut" Header="Cut"/>
|
||||||
|
<MenuItem Command="Copy" Header="Copy"/>
|
||||||
|
<MenuItem Command="Paste" Header="Paste"/>
|
||||||
|
</ContextMenu>
|
||||||
|
</Setter.Value>
|
||||||
|
</Setter>
|
||||||
<Setter Property="Template">
|
<Setter Property="Template">
|
||||||
<Setter.Value>
|
<Setter.Value>
|
||||||
<ControlTemplate TargetType="TextBox">
|
<ControlTemplate TargetType="TextBox">
|
||||||
@ -725,6 +757,7 @@
|
|||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center" HorizontalAlignment="Left"
|
VerticalAlignment="Center" HorizontalAlignment="Left"
|
||||||
FontFamily="Segoe MDL2 Assets"
|
FontFamily="Segoe MDL2 Assets"
|
||||||
|
Foreground="{ButtonBackgroundSelectedColor}"
|
||||||
FontSize="{IconFontSize}"
|
FontSize="{IconFontSize}"
|
||||||
Margin="180,0,0,0">
|
Margin="180,0,0,0">
|
||||||
</TextBlock>
|
</TextBlock>
|
||||||
|
Loading…
Reference in New Issue
Block a user