-
Notifications
You must be signed in to change notification settings - Fork 18
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[New] - Change color depth (Nvidia users only) - Little UI overhaul [Changes] - Audio actions are disabled for now, because the implementation is really buggy [Bug fixes] -Application crashing after waking up from sleep mode #61
- Loading branch information
Showing
17 changed files
with
327 additions
and
409 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> | ||
| <Color x:Key="ActiveColor">#2ac987</Color> | ||
| <Color x:Key="AccentColor">#ff6666</Color> | ||
| <Color x:Key="ControlMouseOverColor">#fa8e8e</Color> | ||
| <Color x:Key="ControlPressedColor">#e36b6b</Color> | ||
|
|
||
| <Color x:Key="WindowColor">White</Color> | ||
| <Color x:Key="SelectedBackgroundColor">#fca9a9</Color> | ||
| <Color x:Key="SelectedUnfocusedColor">#FFDDDDDD</Color> | ||
| <Color x:Key="ControlLightColor">White</Color> | ||
| <Color x:Key="ControlMediumColor">#FFCCCCCC</Color> | ||
| <Color x:Key="GlyphColor">#FF444444</Color> | ||
| <Color x:Key="DisabledForegroundColor">#cfcfcf</Color> | ||
| <Color x:Key="DisabledControlDarkColor">#8a8a8a</Color> | ||
|
|
||
| <Color x:Key="DisabledBorderColor">#adadad</Color> | ||
| <SolidColorBrush x:Key="WindowBackgroundBrush" Color="{StaticResource WindowColor}"/> | ||
| <SolidColorBrush x:Key="ButtonForegroundBrush" Color="{StaticResource WindowColor}"/> | ||
| <SolidColorBrush x:Key="ActiveBrush" Color="{StaticResource ActiveColor}"/> | ||
| <SolidColorBrush x:Key="AccentBrush" Color="{StaticResource AccentColor}"/> | ||
| <SolidColorBrush x:Key="HighlightedBrush" Color="{StaticResource SelectedBackgroundColor}"/> | ||
| <SolidColorBrush x:Key="MouseOverBrush" Color="{StaticResource ControlMouseOverColor}"/> | ||
| <SolidColorBrush x:Key="ControlLightBrush" Color="{StaticResource ControlLightColor}"/> | ||
| <SolidColorBrush x:Key="GlyphBrush" Color="{StaticResource GlyphColor}"/> | ||
|
|
||
| <SolidColorBrush x:Key="InactiveAccentBrush">#ad7b7b</SolidColorBrush> | ||
| <SolidColorBrush x:Key="DragScrollBrush">#757575</SolidColorBrush> | ||
| <SolidColorBrush x:Key="ScrollBrush">#969696</SolidColorBrush> | ||
| <SolidColorBrush x:Key="MouseOverScrollBrush">#a1a1a1</SolidColorBrush> | ||
|
|
||
| <SolidColorBrush x:Key="DisabledAccentBrush" Color="{StaticResource DisabledControlDarkColor}"/> | ||
| <SolidColorBrush x:Key="HighlightedInactiveAccentBrush" Color="#95bfdb"/> | ||
| <StaticResource x:Key="ButtonBackgroundBrush" ResourceKey="AccentBrush"/> | ||
|
|
||
|
|
||
| </ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:system="clr-namespace:System;assembly=mscorlib"> | ||
|
|
||
| <system:Double x:Key="DefaultFontSize">15</system:Double> | ||
| <system:Double x:Key="DefaultRadius">7.5</system:Double> | ||
| <CornerRadius x:Key="CornerRadius">7.5</CornerRadius> | ||
| </ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" | ||
| xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"> | ||
|
|
||
| <ControlTemplate x:Key="ComboBoxToggleButton" TargetType="{x:Type ToggleButton}"> | ||
| <Grid> | ||
| <Grid.ColumnDefinitions> | ||
| <ColumnDefinition /> | ||
| <ColumnDefinition Width="20" /> | ||
| </Grid.ColumnDefinitions> | ||
| <Border Style="{StaticResource DefaultBorder}" | ||
| x:Name="Border" | ||
| Grid.ColumnSpan="2" | ||
| Background="{StaticResource ControlLightBrush}" | ||
| BorderBrush="{StaticResource AccentBrush}" | ||
| BorderThickness="1" /> | ||
| <Border | ||
| Grid.Column="0" | ||
| CornerRadius="0" | ||
| Margin="10,1,0,1" | ||
| Background="{Binding ElementName=Border, Path=Background}" | ||
| BorderBrush="{Binding ElementName=Border, Path=BorderBrush}" | ||
| BorderThickness="0,0,1,0" /> | ||
| <Path | ||
| x:Name="Arrow" | ||
| Grid.Column="1" | ||
| Fill="{StaticResource GlyphBrush}" | ||
| HorizontalAlignment="Center" | ||
| VerticalAlignment="Center" | ||
| Data="M0,0 L0,2 L4,6 L8,2 L8,0 L4,4 z" | ||
| /> | ||
| </Grid> | ||
| <ControlTemplate.Triggers> | ||
| <Trigger Property="ToggleButton.IsMouseOver" Value="true"> | ||
| <Setter TargetName="Border" Property="Background" Value="{StaticResource MouseOverBrush}" /> | ||
| </Trigger> | ||
| <Trigger Property="ToggleButton.IsChecked" Value="true"> | ||
| <Setter TargetName="Border" Property="Background" Value="{StaticResource AccentBrush}" /> | ||
| </Trigger> | ||
| <Trigger Property="IsEnabled" Value="False"> | ||
| <Setter TargetName="Border" Property="Background" Value="{StaticResource DisabledAccentBrush}" /> | ||
| <Setter TargetName="Border" Property="BorderBrush" Value="{StaticResource DisabledAccentBrush}" /> | ||
| <Setter Property="Foreground" Value="Black"/> | ||
| <Setter TargetName="Arrow" Property="Fill" Value="{StaticResource GlyphBrush}" /> | ||
| </Trigger> | ||
| </ControlTemplate.Triggers> | ||
| </ControlTemplate> | ||
|
|
||
| <ControlTemplate x:Key="ComboBoxTextBox" TargetType="{x:Type TextBox}"> | ||
| <Border x:Name="PART_ContentHost" Focusable="False" Background="{TemplateBinding Background}" /> | ||
| </ControlTemplate> | ||
|
|
||
| <Style x:Key="StyledComboBox" TargetType="{x:Type ComboBox}"> | ||
| <Setter Property="SnapsToDevicePixels" Value="true"/> | ||
| <Setter Property="OverridesDefaultStyle" Value="true"/> | ||
| <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto"/> | ||
| <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto"/> | ||
| <Setter Property="ScrollViewer.CanContentScroll" Value="true"/> | ||
| <Setter Property="MinWidth" Value="120"/> | ||
| <Setter Property="MinHeight" Value="20"/> | ||
| <Setter Property="Foreground" Value="Black"/> | ||
| <Setter Property="Template"> | ||
| <Setter.Value> | ||
| <ControlTemplate TargetType="{x:Type ComboBox}"> | ||
| <Grid> | ||
| <ToggleButton | ||
| Name="ToggleButton" | ||
| Template="{StaticResource ComboBoxToggleButton}" | ||
| Grid.Column="2" | ||
| Focusable="false" | ||
| IsChecked="{Binding Path=IsDropDownOpen,Mode=TwoWay,RelativeSource={RelativeSource TemplatedParent}}" | ||
| ClickMode="Press"> | ||
| </ToggleButton> | ||
| <ContentPresenter Name="ContentSite" IsHitTestVisible="False" Content="{TemplateBinding SelectionBoxItem}" | ||
| ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}" | ||
| ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}" | ||
| Margin="5,3,23,3" | ||
| VerticalAlignment="Center" | ||
| HorizontalAlignment="Left" /> | ||
| <TextBox x:Name="PART_EditableTextBox" | ||
| Style="{x:Null}" | ||
| Template="{StaticResource ComboBoxTextBox}" | ||
| HorizontalAlignment="Left" | ||
| VerticalAlignment="Center" | ||
| Margin="5,5,23,3" | ||
| Focusable="True" | ||
| Background="{StaticResource ControlLightBrush}" | ||
| Visibility="Hidden" | ||
| IsReadOnly="{TemplateBinding IsReadOnly}"/> | ||
| <Popup | ||
| Name="Popup" | ||
| Placement="Bottom" | ||
| IsOpen="{TemplateBinding IsDropDownOpen}" | ||
| AllowsTransparency="True" | ||
| Focusable="False" | ||
| PopupAnimation="Slide"> | ||
|
|
||
| <Grid Name="DropDown" | ||
| SnapsToDevicePixels="True" | ||
| MinWidth="{TemplateBinding ActualWidth}" | ||
| MaxHeight="{TemplateBinding MaxDropDownHeight}"> | ||
| <Border | ||
| x:Name="DropDownBorder" Style="{StaticResource DefaultBorder}" CornerRadius="5" | ||
| Background="{StaticResource ControlLightBrush}" BorderThickness="1,1,1,1"/> | ||
| <ScrollViewer Margin="4,6,4,6" SnapsToDevicePixels="True"> | ||
| <StackPanel IsItemsHost="True" KeyboardNavigation.DirectionalNavigation="Contained" /> | ||
| </ScrollViewer> | ||
| </Grid> | ||
| </Popup> | ||
| </Grid> | ||
| <ControlTemplate.Triggers> | ||
| <Trigger Property="HasItems" Value="false"> | ||
| <Setter TargetName="DropDownBorder" Property="MinHeight" Value="95"/> | ||
| </Trigger> | ||
| <Trigger Property="IsEnabled" Value="false"> | ||
| <Setter Property="Foreground" Value="{StaticResource DisabledControlDarkColor}"/> | ||
| </Trigger> | ||
| <Trigger Property="IsGrouping" Value="true"> | ||
| <Setter Property="ScrollViewer.CanContentScroll" Value="false"/> | ||
| </Trigger> | ||
| <Trigger SourceName="Popup" Property="Popup.AllowsTransparency" Value="true"> | ||
| <Setter TargetName="DropDownBorder" Property="CornerRadius" Value="0"/> | ||
| <Setter TargetName="DropDownBorder" Property="Margin" Value="0,2,0,0"/> | ||
| </Trigger> | ||
| <Trigger Property="IsEditable" Value="true"> | ||
| <Setter Property="IsTabStop" Value="false"/> | ||
| <Setter TargetName="PART_EditableTextBox" Property="Visibility" Value="Visible"/> | ||
| <Setter TargetName="ContentSite" Property="Visibility" Value="Hidden"/> | ||
| </Trigger> | ||
| </ControlTemplate.Triggers> | ||
| </ControlTemplate> | ||
| </Setter.Value> | ||
| </Setter> | ||
| <Style.Triggers> | ||
| </Style.Triggers> | ||
| </Style> | ||
|
|
||
| <Style x:Key="{x:Type ComboBoxItem}" TargetType="{x:Type ComboBoxItem}"> | ||
| <Setter Property="SnapsToDevicePixels" Value="true"/> | ||
| <Setter Property="Foreground" Value="Black"/> | ||
| <Setter Property="OverridesDefaultStyle" Value="true"/> | ||
| <Setter Property="Template"> | ||
| <Setter.Value> | ||
| <ControlTemplate TargetType="{x:Type ComboBoxItem}"> | ||
| <Border Name="Border" | ||
| Padding="2" | ||
| SnapsToDevicePixels="true"> | ||
| <ContentPresenter /> | ||
| </Border> | ||
| <ControlTemplate.Triggers> | ||
| <Trigger Property="IsHighlighted" Value="true"> | ||
| <Setter TargetName="Border" Property="Background" Value="{StaticResource MouseOverBrush}"/> | ||
| </Trigger> | ||
| <Trigger Property="IsEnabled" Value="false"> | ||
| <Setter Property="Foreground" Value="{StaticResource DisabledControlDarkColor}"/> | ||
| </Trigger> | ||
| </ControlTemplate.Triggers> | ||
|
|
||
| </ControlTemplate> | ||
| </Setter.Value> | ||
| </Setter> | ||
| </Style> | ||
| <Style TargetType="ComboBox" BasedOn="{StaticResource StyledComboBox}"/> | ||
|
|
||
| </ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" | ||
| xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"> | ||
| <Style x:Key="DefaultBorder" TargetType="Border"> | ||
| <Setter Property="CornerRadius" Value="{StaticResource CornerRadius}"/> | ||
| <Setter Property="BorderBrush" Value="{StaticResource AccentBrush}"/> | ||
| <Setter Property="BorderThickness" Value="1"/> | ||
| <Setter Property="Height" Value="Auto"/> | ||
| <Setter Property="Width" Value="Auto"/> | ||
| <Setter Property="Background" Value="Transparent"/> | ||
| <Setter Property="Effect"> | ||
| <Setter.Value> | ||
| <DropShadowEffect BlurRadius="2.5" ShadowDepth="1" Opacity="0.2" Direction="260" /> | ||
| </Setter.Value> | ||
| </Setter> | ||
|
|
||
| <Style.Triggers> | ||
| <Trigger Property="IsEnabled" Value="false"> | ||
| <Setter Property="Background" Value="{StaticResource DisabledAccentBrush}" /> | ||
| <Setter Property="BorderBrush" Value="{StaticResource DisabledAccentBrush}" /> | ||
| </Trigger> | ||
| </Style.Triggers> | ||
| </Style> | ||
|
|
||
| </ResourceDictionary> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.