Skip to content

Commit a4dac91

Browse files
committed
Support resize window
1 parent f485e86 commit a4dac91

File tree

5 files changed

+57
-8
lines changed

5 files changed

+57
-8
lines changed

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,18 @@ public string Theme
113113
public double? SettingWindowLeft { get; set; } = null;
114114
public System.Windows.WindowState SettingWindowState { get; set; } = WindowState.Normal;
115115

116-
bool _showPlaceholder { get; set; } = true;
116+
bool _resizeWindow { get; set; } = true;
117+
public bool ResizeWindow
118+
{
119+
get => _resizeWindow;
120+
set
121+
{
122+
_resizeWindow = value;
123+
OnPropertyChanged();
124+
}
125+
}
126+
127+
bool _showPlaceholder { get; set; } = false;
117128
public bool ShowPlaceholder
118129
{
119130
get => _showPlaceholder;

Flow.Launcher/Languages/en.xaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -104,11 +104,6 @@
104104
<system:String x:Key="AlwaysPreview">Always Preview</system:String>
105105
<system:String x:Key="AlwaysPreviewToolTip">Always open preview panel when Flow activates. Press {0} to toggle preview.</system:String>
106106
<system:String x:Key="shadowEffectNotAllowed">Shadow effect is not allowed while current theme has blur effect enabled</system:String>
107-
<system:String x:Key="BackdropType">Backdrop Type</system:String>
108-
<system:String x:Key="BackdropTypesNone">None</system:String>
109-
<system:String x:Key="BackdropTypesAcrylic">Acrylic</system:String>
110-
<system:String x:Key="BackdropTypesMica">Mica</system:String>
111-
<system:String x:Key="BackdropTypesMicaAlt">Mica Alt</system:String>
112107

113108
<!-- Setting Plugin -->
114109
<system:String x:Key="searchplugin">Search Plugin</system:String>
@@ -200,10 +195,17 @@
200195
<system:String x:Key="AnimationSpeedCustom">Custom</system:String>
201196
<system:String x:Key="Clock">Clock</system:String>
202197
<system:String x:Key="Date">Date</system:String>
198+
<system:String x:Key="BackdropType">Backdrop Type</system:String>
199+
<system:String x:Key="BackdropTypesNone">None</system:String>
200+
<system:String x:Key="BackdropTypesAcrylic">Acrylic</system:String>
201+
<system:String x:Key="BackdropTypesMica">Mica</system:String>
202+
<system:String x:Key="BackdropTypesMicaAlt">Mica Alt</system:String>
203203
<system:String x:Key="TypeIsDarkToolTip">This theme supports two(light/dark) modes.</system:String>
204204
<system:String x:Key="TypeHasBlurToolTip">This theme supports Blur Transparent Background.</system:String>
205205
<system:String x:Key="PlaceholderText">Placeholder Text</system:String>
206206
<system:String x:Key="PlaceholderTextTip">Display placeholder text when query is empty</system:String>
207+
<system:String x:Key="ResizeWindow">Allow window size change</system:String>
208+
<system:String x:Key="ResizeWindowTip">Allow dragging the search window edges to change its size</system:String>
207209

208210
<!-- Setting Hotkey -->
209211
<system:String x:Key="hotkey">Hotkey</system:String>

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,9 @@ private async void OnLoaded(object sender, RoutedEventArgs _)
115115
welcomeWindow.Show();
116116
}
117117

118+
// Initialize resize mode
119+
SetupResizeMode();
120+
118121
// Initialize place holder
119122
SetupPlaceholderText();
120123

@@ -243,6 +246,9 @@ private async void OnLoaded(object sender, RoutedEventArgs _)
243246
case nameof(Settings.ShowPlaceholder):
244247
SetupPlaceholderText();
245248
break;
249+
case nameof(Settings.ResizeWindow):
250+
SetupResizeMode();
251+
break;
246252
}
247253
};
248254

@@ -1071,6 +1077,15 @@ private void SetPlaceholderText()
10711077

10721078
#endregion
10731079

1080+
#region Resize Mode
1081+
1082+
private void SetupResizeMode()
1083+
{
1084+
ResizeMode = _settings.ResizeWindow ? ResizeMode.CanResize : ResizeMode.NoResize;
1085+
}
1086+
1087+
#endregion
1088+
10741089
#region IDisposable
10751090

10761091
protected virtual void Dispose(bool disposing)

Flow.Launcher/SettingPages/ViewModels/SettingsPaneThemeViewModel.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,12 @@ public double SoundEffectVolume
259259
set => Settings.SoundVolume = value;
260260
}
261261

262+
public bool ResizeWindow
263+
{
264+
get => Settings.ResizeWindow;
265+
set => Settings.ResizeWindow = value;
266+
}
267+
262268
public bool ShowPlaceholder
263269
{
264270
get => Settings.ShowPlaceholder;

Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
VirtualizingStackPanel.IsVirtualizing="True"
3131
VirtualizingStackPanel.ScrollUnit="Pixel">
3232
<StackPanel>
33+
3334
<!-- Page title -->
3435
<TextBlock
3536
Margin="5 23 0 5"
@@ -38,6 +39,7 @@
3839
Text="{DynamicResource appearance}"
3940
TextAlignment="left"
4041
Visibility="Collapsed" />
42+
4143
<!-- Theme Preview and Editor -->
4244
<Grid>
4345
<Grid.Style>
@@ -260,7 +262,8 @@
260262
</StackPanel>
261263
</ScrollViewer>
262264
</Border>
263-
<!-- Theme Preview -->
265+
266+
<!-- Theme preview -->
264267
<Border
265268
Grid.Column="0"
266269
Background="{Binding PreviewBackground}"
@@ -495,7 +498,19 @@
495498
Text="{DynamicResource browserMoreThemes}"
496499
Uri="{Binding LinkThemeGallery}" />
497500

498-
<!-- Fixed Height -->
501+
<!-- Resize window -->
502+
<cc:Card
503+
Title="{DynamicResource ResizeWindow}"
504+
Margin="0 14 0 0"
505+
Icon="&#xE744;"
506+
Sub="{DynamicResource ResizeWindowTip}">
507+
<ui:ToggleSwitch
508+
IsOn="{Binding ResizeWindow}"
509+
OffContent="{DynamicResource disable}"
510+
OnContent="{DynamicResource enable}" />
511+
</cc:Card>
512+
513+
<!-- Fixed height -->
499514
<cc:CardGroup Margin="0 20 0 0">
500515
<cc:Card
501516
Title="{DynamicResource KeepMaxResults}"

0 commit comments

Comments
 (0)