Skip to content

Commit b4865d1

Browse files
SebastienDuruzSebastienDuruz
committed
fix: Realign filters lists to mainwindow list
1 parent 7dd5493 commit b4865d1

4 files changed

Lines changed: 37 additions & 7 deletions

File tree

‎Window-Switcher.sln.DotSettings.user‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStatusExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fa3d6f6d21bb44f64b5c221ff8bd23529d0f28_003Fff_003Fb2895a8c_003FStatusExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
2626
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStyledElement_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F4497571965434e45976e31ec490bbe4b1e2200_003Fee_003F9dadf947_003FStyledElement_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
2727
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AStyledElement_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fb06c2ce0981bf6e5989cda2e3e737e53c2d54ee6ae7e7ce318d378f52e5f66_003FStyledElement_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
28+
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ATemplatedControl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2026_002E1_003Fresharper_002Dhost_003FSourcesCache_003F5870b23e8f5c079e1ec3c9a7d7e386d9a5248cf45a324cc44d371b4f627d2d8_003FTemplatedControl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
2829
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc7102cd0ffb8973777e61b1942c3fffac7e14016a511d055c3adf73ff91748_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
2930
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AThrowHelper_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fc7da56581ee7b20208f09e80b735961e4d5d7b9e5562bfdec94a75c57b391_003FThrowHelper_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
3031
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AWin32DispatcherImpl_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F81cd416261cea43f67fa36858fae091bcf630c94bb8d415fa3b99486ca923a_003FWin32DispatcherImpl_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>

‎src/WindowSwitcher/Theming/AppTheme.axaml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
<Styles xmlns="https://github.com/avaloniaui"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
33
<Styles.Resources>
4+
<SolidColorBrush x:Key="BackgroundBrush" Color="#1F2326" />
45
<SolidColorBrush x:Key="SettingsSectionBorderBrush" Color="#3A3A3A" />
56
<SolidColorBrush x:Key="MutedTextBrush" Color="Gray" />
67
<SolidColorBrush x:Key="ErrorTextBrush" Color="Tomato" />
78
<SolidColorBrush x:Key="FloatingWindowBackgroundBrush" Color="Black" />
89
<SolidColorBrush x:Key="FloatingWindowLabelBrush" Color="Fuchsia" />
910
</Styles.Resources>
11+
12+
<Style Selector="Window">
13+
<Setter Property="Background" Value="{StaticResource BackgroundBrush}" />
14+
</Style>
1015

1116
<Style Selector="TextBlock.window-section-title">
1217
<Setter Property="FontSize" Value="15" />
1318
<Setter Property="FontWeight" Value="SemiBold" />
1419
</Style>
15-
</Styles>
20+
</Styles>

‎src/WindowSwitcher/Windows/FiltersWindow.axaml‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,20 @@
3636
Content="Add"
3737
Click="AddWhitelistClick" />
3838
</Grid>
39-
<ListBox Name="WhitelistListBox"
40-
Grid.Row="1"
41-
SelectionChanged="WhitelistListBoxSelectionChanged" />
39+
<StackPanel Grid.Row="1" Orientation="Vertical" Margin="0 8 0 0" Spacing="0">
40+
<ListBox Name="WhitelistListBox"
41+
Grid.Row="1"
42+
SelectionChanged="WhitelistListBoxSelectionChanged">
43+
<ListBox.Styles>
44+
<Style Selector="ListBoxItem">
45+
<Setter Property="Height" Value="22" />
46+
<Setter Property="FontSize" Value="14" />
47+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
48+
<Setter Property="Padding" Value="8, 2" />
49+
</Style>
50+
</ListBox.Styles>
51+
</ListBox>
52+
</StackPanel>
4253
</Grid>
4354
</TabItem>
4455
<TabItem Header="Blacklist">
@@ -56,9 +67,20 @@
5667
Content="Add"
5768
Click="AddBlacklistClick" />
5869
</Grid>
59-
<ListBox Name="BlacklistListBox"
60-
Grid.Row="1"
61-
SelectionChanged="BlacklistListBoxSelectionChanged" />
70+
<StackPanel Grid.Row="1" Orientation="Vertical" Margin="0 8 0 0" Spacing="0">
71+
<ListBox Name="BlacklistListBox"
72+
Grid.Row="1"
73+
SelectionChanged="BlacklistListBoxSelectionChanged">
74+
<ListBox.Styles>
75+
<Style Selector="ListBoxItem">
76+
<Setter Property="Height" Value="22" />
77+
<Setter Property="FontSize" Value="14" />
78+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
79+
<Setter Property="Padding" Value="8, 2" />
80+
</Style>
81+
</ListBox.Styles>
82+
</ListBox>
83+
</StackPanel>
6284
</Grid>
6385
</TabItem>
6486
</TabControl>

‎src/WindowSwitcher/Windows/FloatingWindow.axaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
xmlns:windows="clr-namespace:WindowSwitcher.Windows"
77
Icon="/Assets/WS_logo.ico"
88
ShowInTaskbar="False"
9+
CanMinimize="False"
10+
CanMaximize="False"
911
ShowActivated="False"
1012
mc:Ignorable="d"
1113
x:Class="WindowSwitcher.Windows.FloatingWindow"

0 commit comments

Comments
 (0)