xstefen/winutil
1
0
Fork 0
mirror of https://github.com/ChrisTitusTech/winutil.git synced 2024-11-14 22:55:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

UI fixes (#2727)

Browse Source 
* 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

* Fix Borders of Right Click menu for Textbox (eg. Searchbar) (#9)

* sync fork & remove merge issues

* Revert "sync fork & remove merge issues"

This reverts commit dd64f06b89.

* remove unneeded code

---------

Co-authored-by: Martin Wiethan <47688561+Marterich@users.noreply.github.com>
This commit is contained in:
MyDrift 2024-09-21 16:29:02 +02:00 committed by GitHub
parent 18dff2af5e
commit 1f683d3f78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 55 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/themes.json
View File

@ -46,6 +46,9 @@
"LabelBackgroundColor": "#F7F7F7", "LabelBackgroundColor": "#F7F7F7",
"LinkForegroundColor": "#232629", "LinkForegroundColor": "#232629",
"LinkHoverForegroundColor": "#232629", "LinkHoverForegroundColor": "#232629",
"ScrollBarBackgroundColor": "#4A4D52",
"ScrollBarHoverColor": "#5A5D62",
"ScrollBarDraggingColor": "#6A6D72",
"ProgressBarForegroundColor": "#2e77ff", "ProgressBarForegroundColor": "#2e77ff",
"ProgressBarBackgroundColor": "Transparent", "ProgressBarBackgroundColor": "Transparent",
@ -77,6 +80,10 @@
"LabelBackgroundColor": "#121212", "LabelBackgroundColor": "#121212",
"LinkForegroundColor": "#add8e6", "LinkForegroundColor": "#add8e6",
"LinkHoverForegroundColor": "#F7F7F7", "LinkHoverForegroundColor": "#F7F7F7",
"ScrollBarBackgroundColor": "#2E3135",
"ScrollBarHoverColor": "#3B4252",
"ScrollBarDraggingColor": "#5E81AC",
"ProgressBarForegroundColor": "#222222", "ProgressBarForegroundColor": "#222222",
"ProgressBarBackgroundColor": "Transparent", "ProgressBarBackgroundColor": "Transparent",
"ProgressBarTextColor": "#cccccc", "ProgressBarTextColor": "#cccccc",

53
xaml/inputXML.xaml
View File

@ -10,13 +10,32 @@
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="{DynamicResource MainBackgroundColor}"/>
<Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
<Setter Property="BorderBrush" Value="{DynamicResource ButtonBackgroundSelectedColor}"/>
<Setter Property="BorderThickness" Value="1"/>
<Setter Property="Padding" Value="5"/>
<Setter Property="FontSize" Value="{DynamicResource FontSize}"/>
<Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
</Style>
<Style TargetType="{x:Type MenuItem}">
<Setter Property="Background" Value="{DynamicResource MainBackgroundColor}"/>
<Setter Property="Foreground" Value="{DynamicResource MainForegroundColor}"/>
<Setter Property="FontSize" Value="{DynamicResource FontSize}"/>
<Setter Property="FontFamily" Value="{DynamicResource FontFamily}"/>
<Setter Property="Padding" Value="5,2,5,2"/>
<Setter Property="BorderThickness" Value="0"/>
</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">
@ -76,7 +95,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="{DynamicResource MainForegroundColor}" /> <Setter Property="Foreground" Value="{DynamicResource ScrollBarBackgroundColor}" />
<Setter Property="Background" Value="{DynamicResource MainBackgroundColor}" /> <Setter Property="Background" Value="{DynamicResource MainBackgroundColor}" />
<Setter Property="Width" Value="6" /> <Setter Property="Width" Value="6" />
<Setter Property="Template"> <Setter Property="Template">
@ -102,10 +121,10 @@
<ControlTemplate.Triggers> <ControlTemplate.Triggers>
<Trigger SourceName="Thumb" Property="IsMouseOver" Value="true"> <Trigger SourceName="Thumb" Property="IsMouseOver" Value="true">
<Setter Value="{DynamicResource ButtonBackgroundMouseoverColor}" TargetName="Thumb" Property="Background" /> <Setter Value="{DynamicResource ScrollBarHoverColor}" TargetName="Thumb" Property="Background" />
</Trigger> </Trigger>
<Trigger SourceName="Thumb" Property="IsDragging" Value="true"> <Trigger SourceName="Thumb" Property="IsDragging" Value="true">
<Setter Value="{DynamicResource ButtonBackgroundSelectedColor}" TargetName="Thumb" Property="Background" /> <Setter Value="{DynamicResource ScrollBarDraggingColor}" TargetName="Thumb" Property="Background" />
</Trigger> </Trigger>
<Trigger Property="IsEnabled" Value="false"> <Trigger Property="IsEnabled" Value="false">
@ -547,6 +566,29 @@
<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>
<ContextMenu.Style>
<Style TargetType="ContextMenu">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="ContextMenu">
<Border Background="{DynamicResource MainBackgroundColor}" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="5" Padding="5">
<StackPanel>
<MenuItem Command="Cut" Header="Cut"/>
<MenuItem Command="Copy" Header="Copy"/>
<MenuItem Command="Paste" Header="Paste"/>
</StackPanel>
</Border>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ContextMenu.Style>
</ContextMenu>
</Setter.Value>
</Setter>
<Setter Property="Template"> <Setter Property="Template">
<Setter.Value> <Setter.Value>
<ControlTemplate TargetType="TextBox"> <ControlTemplate TargetType="TextBox">
@ -697,7 +739,8 @@
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center" HorizontalAlignment="Left" VerticalAlignment="Center" HorizontalAlignment="Left"
FontFamily="Segoe MDL2 Assets" FontFamily="Segoe MDL2 Assets"
FontSize="{DynamicResource DynamicResource IconFontSize}" Foreground="{DynamicResource ButtonBackgroundSelectedColor}"
FontSize="{DynamicResource IconFontSize}"
Margin="180,0,0,0">&#xE721; Margin="180,0,0,0">&#xE721;
</TextBlock> </TextBlock>
<!-- <!--