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

Fix Conflicts

Browse source
This commit is contained in:
DB p 2022-10-25 21:45:06 +09:00
parent de5c0393b0
commit cd6140dcb4
2 changed files with 20 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Flow.Launcher/MainWindow.xaml
View file

@ -80,7 +80,10 @@
Command="{Binding LoadContextMenuCommand}" />
<KeyBinding Key="Left"
Command="{Binding EscCommand}" />
<KeyBinding Key="H"
<KeyBinding
Key="H"
Command="{Binding LoadHistoryCommand}"
Modifiers="Ctrl" />
<KeyBinding Key="Right" Command="{Binding LoadContextMenuCommand}" />
<KeyBinding Key="Left" Command="{Binding EscCommand}" />
<KeyBinding

32
Flow.Launcher/ViewModel/MainViewModel.cs
View file

@ -360,14 +360,14 @@ namespace Flow.Launcher.ViewModel
[RelayCommand]
private void IncreaseWidth()
{
if (MainWindowWidth + 100 > 1920 || _settings.WindowSize == 1920)
if (MainWindowWidth + 100 > 1920 || Settings.WindowSize == 1920)
{
_settings.WindowSize = 1920;
Settings.WindowSize = 1920;
}
else
{
_settings.WindowSize += 100;
_settings.WindowLeft -= 50;
{
Settings.WindowSize += 100;
Settings.WindowLeft -= 50;
}
OnPropertyChanged();
}
@ -375,14 +375,14 @@ namespace Flow.Launcher.ViewModel
[RelayCommand]
private void DecreaseWidth()
{
if (MainWindowWidth - 100 < 400 || _settings.WindowSize == 400)
if (MainWindowWidth - 100 < 400 || Settings.WindowSize == 400)
{
_settings.WindowSize = 400;
Settings.WindowSize = 400;
}
else
{
_settings.WindowLeft += 50;
_settings.WindowSize -= 100;
{
Settings.WindowLeft += 50;
Settings.WindowSize -= 100;
}
OnPropertyChanged();
}
@ -390,19 +390,19 @@ namespace Flow.Launcher.ViewModel
[RelayCommand]
private void IncreaseMaxResult()
{
if (_settings.MaxResultsToShow == 17)
if (Settings.MaxResultsToShow == 17)
return;
_settings.MaxResultsToShow += 1;
Settings.MaxResultsToShow += 1;
}
[RelayCommand]
private void DecreaseMaxResult()
{
if (_settings.MaxResultsToShow == 2)
if (Settings.MaxResultsToShow == 2)
return;
_settings.MaxResultsToShow -= 1;
Settings.MaxResultsToShow -= 1;
}
/// <summary>
@ -482,8 +482,8 @@ namespace Flow.Launcher.ViewModel
public double MainWindowWidth
{
get => _settings.WindowSize;
set => _settings.WindowSize = value;
get => Settings.WindowSize;
set => Settings.WindowSize = value;
}
public string PluginIconPath { get; set; } = null;