prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #1996 from VictoriousRaptor/Amend1978

Browse source 
Amend 1978
This commit is contained in:
VictoriousRaptor 2023-03-20 21:08:48 +08:00 committed by GitHub
commit bcc29ce3c1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Flow.Launcher/Languages/en.xaml
View file

@ -43,6 +43,7 @@
<system:String x:Key="SearchWindowScreenFocus">Monitor with Focused Window</system:String>
<system:String x:Key="SearchWindowScreenPrimary">Primary Monitor</system:String>
<system:String x:Key="SearchWindowScreenCustom">Custom Monitor</system:String>
<system:String x:Key="SearchWindowAlign">Search Window Position on Monitor</system:String>
<system:String x:Key="SearchWindowAlignCenter">Center</system:String>
<system:String x:Key="SearchWindowAlignCenterTop">Center Top</system:String>
<system:String x:Key="SearchWindowAlignLeftTop">Left Top</system:String>

2
Flow.Launcher/MainWindow.xaml.cs
View file

@ -17,7 +17,6 @@ using DragEventArgs = System.Windows.DragEventArgs;
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using NotifyIcon = System.Windows.Forms.NotifyIcon;
using Flow.Launcher.Infrastructure;
using System.Windows.Media;
using Flow.Launcher.Infrastructure.Hotkey;
using Flow.Launcher.Plugin.SharedCommands;
using System.Windows.Threading;
@ -25,7 +24,6 @@ using System.Windows.Data;
using ModernWpf.Controls;
using Key = System.Windows.Input.Key;
using System.Media;
using System.Linq;
namespace Flow.Launcher
{

44
Flow.Launcher/SettingWindow.xaml
View file

@ -774,19 +774,19 @@
<ItemsControl Style="{StaticResource SettingGrid}">
<StackPanel Style="{StaticResource TextPanel}">
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Search Window position on selected screen" />
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SearchWindowAlign}" />
</StackPanel>
<StackPanel Grid.Column="2" Orientation="Horizontal">
<ComboBox
x:Name="SearchWindowPosition"
MinWidth="160"
Margin="0,0,18,0"
VerticalAlignment="Center"
DisplayMemberPath="Display"
FontSize="14"
ItemsSource="{Binding SearchWindowAligns}"
SelectedValue="{Binding Settings.SearchWindowAlign}"
SelectedValuePath="Value">
x:Name="SearchWindowPosition"
MinWidth="160"
Margin="0,0,18,0"
VerticalAlignment="Center"
DisplayMemberPath="Display"
FontSize="14"
ItemsSource="{Binding SearchWindowAligns}"
SelectedValue="{Binding Settings.SearchWindowAlign}"
SelectedValuePath="Value">
</ComboBox>
<StackPanel Margin="0,0,18,0" Orientation="Horizontal">
<StackPanel.Style>
@ -800,20 +800,20 @@
</Style>
</StackPanel.Style>
<TextBox
Height="35"
MinWidth="120"
Text="{Binding Settings.CustomWindowLeft}"
TextWrapping="NoWrap" />
Height="35"
MinWidth="80"
Text="{Binding Settings.CustomWindowLeft}"
TextWrapping="NoWrap" />
<TextBlock
Margin="10"
VerticalAlignment="Center"
Foreground="{DynamicResource Color05B}"
Text="x" />
Margin="10"
VerticalAlignment="Center"
Foreground="{DynamicResource Color05B}"
Text="x" />
<TextBox
Height="35"
MinWidth="120"
Text="{Binding Settings.CustomWindowTop}"
TextWrapping="NoWrap" />
Height="35"
MinWidth="80"
Text="{Binding Settings.CustomWindowTop}"
TextWrapping="NoWrap" />
</StackPanel>
</StackPanel>
<TextBlock Style="{StaticResource Glyph}">

1
Flow.Launcher/ViewModel/SettingWindowViewModel.cs
View file

@ -22,7 +22,6 @@ using Flow.Launcher.Plugin.SharedModels;
using System.Collections.ObjectModel;
using CommunityToolkit.Mvvm.Input;
using System.Globalization;
using static Flow.Launcher.ViewModel.SettingWindowViewModel;
namespace Flow.Launcher.ViewModel
{