Skip to content

Ui refactor #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
SebastienDuruz wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Ui refactor #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Window-Switcher.sln.DotSettings.user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<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>
<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>
<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>
<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>
<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>
<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>
<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>
Expand Down
7 changes: 6 additions & 1 deletion src/WindowSwitcher/Theming/AppTheme.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Styles.Resources>
<SolidColorBrush x:Key="BackgroundBrush" Color="#1F2326" />
<SolidColorBrush x:Key="SettingsSectionBorderBrush" Color="#3A3A3A" />
<SolidColorBrush x:Key="MutedTextBrush" Color="Gray" />
<SolidColorBrush x:Key="ErrorTextBrush" Color="Tomato" />
<SolidColorBrush x:Key="FloatingWindowBackgroundBrush" Color="Black" />
<SolidColorBrush x:Key="FloatingWindowLabelBrush" Color="Fuchsia" />
</Styles.Resources>

<Style Selector="Window">
<Setter Property="Background" Value="{StaticResource BackgroundBrush}" />
</Style>

<Style Selector="TextBlock.window-section-title">
<Setter Property="FontSize" Value="15" />
<Setter Property="FontWeight" Value="SemiBold" />
</Style>
</Styles>
</Styles>
34 changes: 28 additions & 6 deletions src/WindowSwitcher/Windows/FiltersWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,20 @@
Content="Add"
Click="AddWhitelistClick" />
</Grid>
<ListBox Name="WhitelistListBox"
Grid.Row="1"
SelectionChanged="WhitelistListBoxSelectionChanged" />
<StackPanel Grid.Row="1" Orientation="Vertical" Margin="0 8 0 0" Spacing="0">
<ListBox Name="WhitelistListBox"
Grid.Row="1"
SelectionChanged="WhitelistListBoxSelectionChanged">
<ListBox.Styles>
<Style Selector="ListBoxItem">
<Setter Property="Height" Value="22" />
<Setter Property="FontSize" Value="14" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="Padding" Value="8, 2" />
</Style>
</ListBox.Styles>
</ListBox>
</StackPanel>
</Grid>
</TabItem>
<TabItem Header="Blacklist">
Expand All @@ -56,9 +67,20 @@
Content="Add"
Click="AddBlacklistClick" />
</Grid>
<ListBox Name="BlacklistListBox"
Grid.Row="1"
SelectionChanged="BlacklistListBoxSelectionChanged" />
<StackPanel Grid.Row="1" Orientation="Vertical" Margin="0 8 0 0" Spacing="0">
<ListBox Name="BlacklistListBox"
Grid.Row="1"
SelectionChanged="BlacklistListBoxSelectionChanged">
<ListBox.Styles>
<Style Selector="ListBoxItem">
<Setter Property="Height" Value="22" />
<Setter Property="FontSize" Value="14" />
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
<Setter Property="Padding" Value="8, 2" />
</Style>
</ListBox.Styles>
</ListBox>
</StackPanel>
</Grid>
</TabItem>
</TabControl>
Expand Down
2 changes: 2 additions & 0 deletions src/WindowSwitcher/Windows/FloatingWindow.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
xmlns:windows="clr-namespace:WindowSwitcher.Windows"
Icon="/Assets/WS_logo.ico"
ShowInTaskbar="False"
CanMinimize="False"
CanMaximize="False"
ShowActivated="False"
mc:Ignorable="d"
x:Class="WindowSwitcher.Windows.FloatingWindow"
Expand Down