Skip to content

Commit

Permalink
[ColorPicker]Revert turning the main window into a FluentWindow (#32209)
Browse files Browse the repository at this point in the history
This reverts commit 62d278b.

Making the Color Picker windows be a Fluent Windows is making it not be drawn on very specific configuration. Yanking it out for release until we can figure it out.
  • Loading branch information
jaimecbernardo committed Apr 3, 2024
1 parent a24ffb3 commit b0c8e8b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
8 changes: 3 additions & 5 deletions src/modules/colorPicker/ColorPickerUI/MainWindow.xaml
Original file line number Diff line number Diff line change
@@ -1,31 +1,29 @@
<ui:FluentWindow
<Window
x:Class="ColorPicker.MainWindow"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:behaviors="clr-namespace:ColorPicker.Behaviors"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:e="http://schemas.microsoft.com/xaml/behaviors"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.lepo.co/wpfui/2022/xaml"
Width="120"
Height="64"
MinWidth="0"
MinHeight="0"
AllowsTransparency="True"
AutomationProperties.Name="Color Picker"
Background="Transparent"
ExtendsContentIntoTitleBar="True"
Opacity="0.1"
ResizeMode="NoResize"
ShowInTaskbar="False"
SizeToContent="WidthAndHeight"
SourceInitialized="MainWindowSourceInitialized"
Topmost="True"
WindowCornerPreference="Default"
WindowStyle="None"
mc:Ignorable="d">
<e:Interaction.Behaviors>
<behaviors:ChangeWindowPositionBehavior />
<behaviors:AppearAnimationBehavior />
</e:Interaction.Behaviors>
<ContentControl x:Name="MainView" Content="{Binding MainViewModel}" />
</ui:FluentWindow>
</Window>
2 changes: 1 addition & 1 deletion src/modules/colorPicker/ColorPickerUI/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace ColorPicker
/// <summary>
/// Interaction logic for MainWindow.xaml
/// </summary>
public partial class MainWindow : FluentWindow
public partial class MainWindow : Window
{
public MainWindow()
{
Expand Down

0 comments on commit b0c8e8b

Please sign in to comment.