diff --git a/.pipelines/applyXamlStyling.ps1 b/.pipelines/applyXamlStyling.ps1 index c360d18a03..57f4ae8ee1 100644 --- a/.pipelines/applyXamlStyling.ps1 +++ b/.pipelines/applyXamlStyling.ps1 @@ -107,7 +107,7 @@ if (-not $Passive) else { Write-Output "Checking all files (passively)" - $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\Generated Files\\PowerRenameXAML\\)|(\\launcher\\PowerLauncher\\)|(\\launcher\\Wox.Plugin\\)|(\\colorPicker\\ColorPickerUI\\)" } + $files = Get-ChildItem -Path "$PSScriptRoot\..\src\*.xaml" -Recurse | Select-Object -ExpandProperty FullName | Where-Object { $_ -notmatch "(\\obj\\)|(\\bin\\)|(\\x64\\)|(\\Generated Files\\PowerRenameXAML\\)|(\\colorPicker\\ColorPickerUI\\)" } if ($files.count -gt 0) { diff --git a/src/modules/launcher/PowerLauncher/MainWindow.xaml b/src/modules/launcher/PowerLauncher/MainWindow.xaml index 38aa120e02..258dfe464b 100644 --- a/src/modules/launcher/PowerLauncher/MainWindow.xaml +++ b/src/modules/launcher/PowerLauncher/MainWindow.xaml @@ -10,6 +10,7 @@ xmlns:vm="clr-namespace:PowerLauncher.ViewModel" Title="PowerToys Run" Width="640" + MinHeight="0" d:DataContext="{d:DesignInstance vm:MainViewModel}" ui:ExtendsContentIntoTitleBar="True" AllowDrop="True" @@ -27,8 +28,7 @@ Visibility="{Binding MainWindowVisibility, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" WindowStartupLocation="Manual" WindowStyle="None" - mc:Ignorable="d" - MinHeight="0"> + mc:Ignorable="d"> diff --git a/src/modules/launcher/Wox.Plugin/LibraryThemes/GeneratorParameters.json b/src/modules/launcher/Wox.Plugin/LibraryThemes/GeneratorParameters.json deleted file mode 100644 index 3cc5ec4f3a..0000000000 --- a/src/modules/launcher/Wox.Plugin/LibraryThemes/GeneratorParameters.json +++ /dev/null @@ -1,111 +0,0 @@ -{ - "DefaultValues": { - "Theme.IsHighContrast": "false" - }, - "BaseColorSchemes": [ - { - "Name": "Dark", - "Values": { - "PrimaryAccentColor": "Black", - "SystemBaseMediumLowColor": "#FF818181", - "SystemChromeLow": "#FF171717", - "TextControlPlaceholderForeground": "#FF818181", - "TextBox.Static.Border": "Transparent", - "TextBox.MouseOver.Border": "Transparent", - "TextBox.Focus.Border": "Transparent", - "ButtonBackgroundPointerOver": "#30FFFFFF", - "ButtonBorderPointerOver": "#61FFFFFF", - "ButtonBackgroundPressed": "#30FFFFFF", - "ButtonBorderPressed": "#61FFFFFF", - "ListViewItemBackgroundPointerOver": "#FF363636", - "ControlTextBrushKey": "White", - "SecondaryTextForeground": "#FFa1a1a1", - "InactiveSelectionHighlightBrushKey": "White", - "DialogBorderBrush": "#FF373737", - "ScrollBarThumbBackground": "#FF7a7a7a", - "ScrollBarThumbPointerOver": "#FF767676", - "ScrollBarThumbPointerPressed": "#FFa4a4a4", - "ScrollBarBackgroundPointerOver": "#FF1b1b1b", - "ScrollBarLineButtonForeground": "#FFcdcdcd", - "ScrollBarLineButtonForegroundPointerOver": "#FFcdcdcd", - "ScrollBarLineButtonForegroundPointerPressed": "#FF171717", - "ScrollBarLineButtonBackground": "Transparent", - "ScrollBarLineButtonBackgroundPointerOver": "#FF313131", - "ScrollBarLineButtonBackgroundPointerPressed": "#FFa4a4a4", - "ToolTipBorderBrushKey": "#5B000000", - "ToolTipForegroundBrushKey": "#FFFFFFFF", - "ToolTipBackgroundBrushKey": "#FF2B2B2B" - } - }, - { - "Name": "Light", - "Values": { - "PrimaryAccentColor": "White", - "SystemBaseMediumLowColor": "#66000000", - "SystemChromeLow": "#FFF2F2F2", - "TextControlPlaceholderForeground": "#FF5b5b5b", - "TextBox.Static.Border": "Transparent", - "TextBox.MouseOver.Border": "Transparent", - "TextBox.Focus.Border": "Transparent", - "ButtonBackgroundPointerOver": "#2E000000", - "ButtonBorderPointerOver": "#61000000", - "ButtonBackgroundPressed": "#30000000", - "ButtonBorderPressed": "#61000000", - "ListViewItemBackgroundPointerOver": "#FFd2d2d2", - "ControlTextBrushKey": "Black", - "SecondaryTextForeground": "#FF434343", - "InactiveSelectionHighlightBrushKey": "Black", - "DialogBorderBrush": "#FFf7f7f7", - "ScrollBarThumbBackground": "#FF7a7a7a", - "ScrollBarThumbPointerOver": "#FFa0a0a0", - "ScrollBarThumbPointerPressed": "#FF747474", - "ScrollBarBackgroundPointerOver": "#FFf0f0f0", - "ScrollBarLineButtonForeground": "#FF1d1d1d", - "ScrollBarLineButtonForegroundPointerOver": "#FF1d1d1d", - "ScrollBarLineButtonForegroundPointerPressed": "#FFf3f3f3", - "ScrollBarLineButtonBackground": "Transparent", - "ScrollBarLineButtonBackgroundPointerOver": "#FFd2d2d2", - "ScrollBarLineButtonBackgroundPointerPressed": "#FF5d5d5d", - "ToolTipBorderBrushKey": "#FFD0D0D0", - "ToolTipForegroundBrushKey": "#FF000000", - "ToolTipBackgroundBrushKey": "#FFFBFBFB" - } - }, - { - "Name": "HighContrast", - "Values": { - "Theme.IsHighContrast": "true", - "PrimaryAccentColor": "White", - "SystemBaseMediumLowColor": "#ffff00", - "SystemChromeLow": "Black", - "TextControlPlaceholderForeground": "#FF008000", - "TextBox.Static.Border": "Transparent", - "TextBox.MouseOver.Border": "Transparent", - "TextBox.Focus.Border": "Transparent", - "ButtonBackgroundPointerOver": "Black", - "ButtonBorderPointerOver": "White", - "ButtonBackgroundPressed": "White", - "ButtonBorderPressed": "White", - "ListViewItemBackgroundPointerOver": "#FF003300", - "ControlTextBrushKey": "#FFffff00", - "SecondaryTextForeground": "#FF008000", - "InactiveSelectionHighlightBrushKey": "#FFFFFFFF", - "DialogBorderBrush": "#FF373737", - "ScrollBarThumbBackground": "White", - "ScrollBarThumbPointerOver": "#FF008000", - "ScrollBarThumbPointerPressed": "#FF008000", - "ScrollBarBackgroundPointerOver": "#FF000000", - "ScrollBarLineButtonForeground": "#FFFFFFFF", - "ScrollBarLineButtonForegroundPointerOver": "#FFFFFFFF", - "ScrollBarLineButtonForegroundPointerPressed": "#FFFFFFFF", - "ScrollBarLineButtonBackground": "Black", - "ScrollBarLineButtonBackgroundPointerOver": "#FF000000", - "ScrollBarLineButtonBackgroundPointerPressed": "#FF000000", - "ToolTipBorderBrushKey": "#5B000000", - "ToolTipForegroundBrushKey": "#FFFFFFFF", - "ToolTipBackgroundBrushKey": "#FF2B2B2B" - } - } - ], - "ColorSchemes": [] -} \ No newline at end of file diff --git a/src/modules/launcher/Wox.Plugin/LibraryThemes/Theme.Template.xaml b/src/modules/launcher/Wox.Plugin/LibraryThemes/Theme.Template.xaml deleted file mode 100644 index e0600b3378..0000000000 --- a/src/modules/launcher/Wox.Plugin/LibraryThemes/Theme.Template.xaml +++ /dev/null @@ -1,50 +0,0 @@ - - - - {{ThemeName}} - PowerToysRun - {{ThemeDisplayName}} - {{BaseColorScheme}} - {{ColorScheme}} - {{PrimaryAccentColor}} - {{IsHighContrast}} - - {{SystemBaseMediumLowColor}} - - - - - - - - - - - - - - - - - {{ScrollBarThumbPointerOver}} - {{ScrollBarThumbPointerPressed}} - - {{ScrollBarBackgroundPointerOver}} - - - {{ScrollBarLineButtonForegroundPointerOver}} - {{ScrollBarLineButtonForegroundPointerPressed}} - - - {{ScrollBarLineButtonBackgroundPointerOver}} - {{ScrollBarLineButtonBackgroundPointerPressed}} - - - - - \ No newline at end of file