Skip to content

Commit 115d3a5

Browse files
Add custom monitor number selection combobox
1 parent 278f0eb commit 115d3a5

File tree

4 files changed

+21
-6
lines changed

4 files changed

+21
-6
lines changed

Flow.Launcher.Infrastructure/UserSettings/Settings.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public bool HideNotifyIcon
245245
[JsonConverter(typeof(JsonStringEnumConverter))]
246246
public SearchWindowAligns SearchWindowAlign { get; set; } = SearchWindowAligns.Center;
247247

248-
public string CustomScreenDeviceName { get; set; } = string.Empty;
248+
public int CustomScreenNumber { get; set; } = 1;
249249

250250
public bool IgnoreHotkeysOnFullscreen { get; set; }
251251

Flow.Launcher/MainWindow.xaml.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,10 @@ public Screen SelectedScreen()
550550
screen = Screen.FromHandle(foregroundWindowHandle);
551551
break;
552552
case SearchWindowScreens.Custom:
553-
screen = Screen.AllScreens.FirstOrDefault(s => s.DeviceName == _settings.CustomScreenDeviceName);
553+
if (_settings.CustomScreenNumber <= Screen.AllScreens.Length)
554+
screen = Screen.AllScreens[_settings.CustomScreenNumber - 1];
555+
else
556+
screen = Screen.AllScreens[0];
554557
break;
555558
default:
556559
screen = Screen.AllScreens[0];

Flow.Launcher/SettingWindow.xaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -719,11 +719,9 @@
719719
MinWidth="160"
720720
Margin="0,0,18,0"
721721
VerticalAlignment="Center"
722-
DisplayMemberPath="Display"
723722
FontSize="14"
724-
ItemsSource="{Binding SearchWindowAligns}"
725-
SelectedValue="{Binding Settings.SearchWindowAlign}"
726-
SelectedValuePath="Value">
723+
ItemsSource="{Binding ScreenNumbers}"
724+
SelectedValue="{Binding Settings.CustomScreenNumber}">
727725
<ComboBox.Style>
728726
<Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="ComboBox">
729727
<Setter Property="Visibility" Value="Collapsed" />

Flow.Launcher/ViewModel/SettingWindowViewModel.cs

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,20 @@ public List<SearchWindowAlign> SearchWindowAligns
517517
}
518518
}
519519

520+
public List<int> ScreenNumbers
521+
{
522+
get
523+
{
524+
var screens = System.Windows.Forms.Screen.AllScreens;
525+
var screenNumbers = new List<int>();
526+
for (int i = 1; i <= screens.Length; i++)
527+
{
528+
screenNumbers.Add(i);
529+
}
530+
return screenNumbers;
531+
}
532+
}
533+
520534
public List<string> TimeFormatList { get; } = new()
521535
{
522536
"h:mm",

0 commit comments

Comments
 (0)