Skip to content

Fix Saving Window Width #2733

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

Merged
merged 4 commits into from
May 28, 2024
Merged

Fix Saving Window Width #2733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b87237f
- Fix Window Width Save
onesounds May 28, 2024
52d142c
One-time binding for main window width
Yusyuriv May 28, 2024
f62561f
Don't save new window width if the window is hidden
Yusyuriv May 28, 2024
96f4153
Correctly notify windows size change, use window left position for ma…
Yusyuriv May 28, 2024
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
3 changes: 2 additions & 1 deletion Flow.Launcher/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Name="FlowMainWindow"
Title="Flow Launcher"
Width="{Binding MainWindowWidth, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
MinWidth="430"
MinWidth="400"
MinHeight="30"
d:DataContext="{d:DesignInstance Type=vm:MainViewModel}"
AllowDrop="True"
Expand All @@ -23,6 +23,7 @@
Deactivated="OnDeactivated"
Icon="Images/app.png"
Initialized="OnInitialized"
Left="{Binding Settings.WindowLeft, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Loaded="OnLoaded"
LocationChanged="OnLocationChanged"
Opacity="{Binding MainWindowOpacity, Mode=OneWay, UpdateSourceTrigger=PropertyChanged}"
Expand Down
6 changes: 0 additions & 6 deletions Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,12 +173,6 @@ public bool KeepMaxResults

public string DateText => DateTime.Now.ToString(DateFormat, CultureInfo.CurrentCulture);

public double WindowWidthSize
{
get => Settings.WindowSize;
set => Settings.WindowSize = value;
}

public bool UseGlyphIcons
{
get => Settings.UseGlyphIcons;
Expand Down
10 changes: 7 additions & 3 deletions Flow.Launcher/ViewModel/MainViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ private void IncreaseWidth()
{
Settings.WindowSize += 100;
Settings.WindowLeft -= 50;
OnPropertyChanged();
OnPropertyChanged(nameof(MainWindowWidth));
}

[RelayCommand]
Expand All @@ -554,7 +554,7 @@ private void DecreaseWidth()
Settings.WindowSize -= 100;
}

OnPropertyChanged();
OnPropertyChanged(nameof(MainWindowWidth));
}

[RelayCommand]
Expand Down Expand Up @@ -706,7 +706,11 @@ private ResultsViewModel SelectedResults
public double MainWindowWidth
{
get => Settings.WindowSize;
set => Settings.WindowSize = value;
set
{
if (!MainWindowVisibilityStatus) return;
Settings.WindowSize = value;
}
}

public double MainWindowHeight
Expand Down