File tree Expand file tree Collapse file tree 4 files changed +21
-6
lines changed
Flow.Launcher.Infrastructure/UserSettings Expand file tree Collapse file tree 4 files changed +21
-6
lines changed Original file line number Diff line number Diff line change @@ -245,7 +245,7 @@ public bool HideNotifyIcon
245
245
[ JsonConverter ( typeof ( JsonStringEnumConverter ) ) ]
246
246
public SearchWindowAligns SearchWindowAlign { get ; set ; } = SearchWindowAligns . Center ;
247
247
248
- public string CustomScreenDeviceName { get ; set ; } = string . Empty ;
248
+ public int CustomScreenNumber { get ; set ; } = 1 ;
249
249
250
250
public bool IgnoreHotkeysOnFullscreen { get ; set ; }
251
251
Original file line number Diff line number Diff line change @@ -550,7 +550,10 @@ public Screen SelectedScreen()
550
550
screen = Screen . FromHandle ( foregroundWindowHandle ) ;
551
551
break ;
552
552
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 ] ;
554
557
break ;
555
558
default :
556
559
screen = Screen . AllScreens [ 0 ] ;
Original file line number Diff line number Diff line change 719
719
MinWidth =" 160"
720
720
Margin =" 0,0,18,0"
721
721
VerticalAlignment =" Center"
722
- DisplayMemberPath =" Display"
723
722
FontSize =" 14"
724
- ItemsSource =" {Binding SearchWindowAligns}"
725
- SelectedValue =" {Binding Settings.SearchWindowAlign}"
726
- SelectedValuePath =" Value" >
723
+ ItemsSource =" {Binding ScreenNumbers}"
724
+ SelectedValue =" {Binding Settings.CustomScreenNumber}" >
727
725
<ComboBox .Style>
728
726
<Style BasedOn =" {StaticResource DefaultComboBoxStyle}" TargetType =" ComboBox" >
729
727
<Setter Property =" Visibility" Value =" Collapsed" />
Original file line number Diff line number Diff line change @@ -517,6 +517,20 @@ public List<SearchWindowAlign> SearchWindowAligns
517
517
}
518
518
}
519
519
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
+
520
534
public List < string > TimeFormatList { get ; } = new ( )
521
535
{
522
536
"h:mm" ,
You can’t perform that action at this time.
0 commit comments