Skip to content

Commit 56adac6

Browse files
VictoriousRaptorVictoriousRaptor
committed
Tweak UI for multi monitor
1 parent e020cef commit 56adac6

File tree

1 file changed

+115
-70
lines changed

1 file changed

+115
-70
lines changed

‎Flow.Launcher/SettingWindow.xaml

Lines changed: 115 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -694,78 +694,123 @@
694694
</Border>
695695

696696
<Border Margin="0,30,0,0" Style="{DynamicResource SettingGroupBox}">
697-
<ItemsControl Style="{StaticResource SettingGrid}">
698-
<StackPanel Style="{StaticResource TextPanel}">
699-
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SearchWindowPosition}" />
700-
</StackPanel>
701-
<StackPanel Grid.Column="2" Orientation="Horizontal">
702-
<ComboBox
703-
x:Name="SearchWindowScreen"
704-
MinWidth="220"
705-
Margin="0,0,18,0"
706-
VerticalAlignment="Center"
707-
DisplayMemberPath="Display"
708-
FontSize="14"
709-
ItemsSource="{Binding SearchWindowScreens}"
710-
SelectedValue="{Binding Settings.SearchWindowScreen}"
711-
SelectedValuePath="Value" />
712-
<ComboBox
713-
x:Name="SearchWindowPosition"
714-
MinWidth="160"
715-
Margin="0,0,18,0"
716-
VerticalAlignment="Center"
717-
DisplayMemberPath="Display"
718-
FontSize="14"
719-
ItemsSource="{Binding SearchWindowAligns}"
720-
SelectedValue="{Binding Settings.SearchWindowAlign}"
721-
SelectedValuePath="Value">
722-
<ComboBox.Style>
723-
<Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="ComboBox">
724-
<Setter Property="Visibility" Value="Visible" />
725-
<Style.Triggers>
726-
<DataTrigger Binding="{Binding ElementName=SearchWindowScreen, Path=SelectedIndex}" Value="0">
727-
<Setter Property="Visibility" Value="Collapsed" />
728-
</DataTrigger>
729-
<DataTrigger Binding="{Binding ElementName=SearchWindowScreen, Path=SelectedIndex}" Value="4">
697+
<StackPanel Orientation="Vertical">
698+
<Border
699+
Margin="0"
700+
BorderThickness="0"
701+
Style="{DynamicResource SettingGroupBox}">
702+
<ItemsControl Style="{StaticResource SettingGrid}">
703+
<StackPanel Style="{StaticResource TextPanel}">
704+
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="{DynamicResource SearchWindowPosition}" />
705+
</StackPanel>
706+
<StackPanel Grid.Column="2" Orientation="Horizontal">
707+
<ComboBox
708+
x:Name="SearchWindowScreen"
709+
MinWidth="220"
710+
Margin="0,0,18,0"
711+
VerticalAlignment="Center"
712+
DisplayMemberPath="Display"
713+
FontSize="14"
714+
ItemsSource="{Binding SearchWindowScreens}"
715+
SelectedValue="{Binding Settings.SearchWindowScreen}"
716+
SelectedValuePath="Value" />
717+
<ComboBox
718+
x:Name="SelectScreen"
719+
MinWidth="160"
720+
Margin="0,0,18,0"
721+
VerticalAlignment="Center"
722+
DisplayMemberPath="Display"
723+
FontSize="14"
724+
ItemsSource="{Binding SearchWindowAligns}"
725+
SelectedValue="{Binding Settings.SearchWindowAlign}"
726+
SelectedValuePath="Value">
727+
<ComboBox.Style>
728+
<Style BasedOn="{StaticResource DefaultComboBoxStyle}" TargetType="ComboBox">
730729
<Setter Property="Visibility" Value="Collapsed" />
731-
</DataTrigger>
732-
</Style.Triggers>
730+
<Style.Triggers>
731+
<DataTrigger Binding="{Binding ElementName=SearchWindowScreen, Path=SelectedValue}" Value="{x:Static userSettings:SearchWindowScreens.Custom}">
732+
<Setter Property="Visibility" Value="Visible" />
733+
</DataTrigger>
734+
</Style.Triggers>
735+
</Style>
736+
</ComboBox.Style>
737+
</ComboBox>
738+
</StackPanel>
739+
<TextBlock Style="{StaticResource Glyph}">
740+
&#xe7f4;
741+
</TextBlock>
742+
</ItemsControl>
743+
</Border>
733744

734-
</Style>
735-
</ComboBox.Style>
736-
</ComboBox>
737-
<StackPanel Margin="0,0,18,0" Orientation="Horizontal">
738-
<StackPanel.Style>
739-
<Style TargetType="StackPanel">
740-
<Setter Property="Visibility" Value="Collapsed" />
741-
<Style.Triggers>
742-
<DataTrigger Binding="{Binding ElementName=SearchWindowScreen, Path=SelectedIndex}" Value="4">
743-
<Setter Property="Visibility" Value="Visible" />
744-
</DataTrigger>
745-
</Style.Triggers>
746-
</Style>
747-
</StackPanel.Style>
748-
<TextBox
749-
Height="35"
750-
MinWidth="120"
751-
Text="{Binding Settings.CustomWindowLeft}"
752-
TextWrapping="NoWrap" />
753-
<TextBlock
754-
Margin="10"
755-
VerticalAlignment="Center"
756-
Foreground="{DynamicResource Color05B}"
757-
Text="x" />
758-
<TextBox
759-
Height="35"
760-
MinWidth="120"
761-
Text="{Binding Settings.CustomWindowTop}"
762-
TextWrapping="NoWrap" />
763-
</StackPanel>
764-
</StackPanel>
765-
<TextBlock Style="{StaticResource Glyph}">
766-
&#xe7f4;
767-
</TextBlock>
768-
</ItemsControl>
745+
<Separator
746+
Width="Auto"
747+
BorderThickness="1"
748+
Style="{StaticResource SettingSeparatorStyle}"/>
749+
750+
<Border
751+
Margin="0"
752+
BorderThickness="0">
753+
<Border.Style>
754+
<Style BasedOn="{StaticResource SettingGroupBox}" TargetType="Border">
755+
<Setter Property="Visibility" Value="Visible" />
756+
<Style.Triggers>
757+
<DataTrigger Binding="{Binding ElementName=SearchWindowScreen, Path=SelectedValue}" Value="{x:Static userSettings:SearchWindowScreens.RememberLastLaunchLocation}">
758+
<Setter Property="Visibility" Value="Collapsed" />
759+
</DataTrigger>
760+
</Style.Triggers>
761+
</Style>
762+
</Border.Style>
763+
764+
<ItemsControl Style="{StaticResource SettingGrid}">
765+
<StackPanel Style="{StaticResource TextPanel}">
766+
<TextBlock Style="{DynamicResource SettingTitleLabel}" Text="Search Window position on selected screen" />
767+
</StackPanel>
768+
<StackPanel Grid.Column="2" Orientation="Horizontal">
769+
<ComboBox
770+
x:Name="SearchWindowPosition"
771+
MinWidth="160"
772+
Margin="0,0,18,0"
773+
VerticalAlignment="Center"
774+
DisplayMemberPath="Display"
775+
FontSize="14"
776+
ItemsSource="{Binding SearchWindowAligns}"
777+
SelectedValue="{Binding Settings.SearchWindowAlign}"
778+
SelectedValuePath="Value">
779+
</ComboBox>
780+
<StackPanel Margin="0,0,18,0" Orientation="Horizontal">
781+
<StackPanel.Style>
782+
<Style TargetType="StackPanel">
783+
<Setter Property="Visibility" Value="Collapsed" />
784+
<Style.Triggers>
785+
<DataTrigger Binding="{Binding ElementName=SearchWindowPosition, Path=SelectedValue}" Value="{x:Static userSettings:SearchWindowAligns.Custom}">
786+
<Setter Property="Visibility" Value="Visible" />
787+
</DataTrigger>
788+
</Style.Triggers>
789+
</Style>
790+
</StackPanel.Style>
791+
<TextBox
792+
Height="35"
793+
MinWidth="120"
794+
Text="{Binding Settings.CustomWindowLeft}"
795+
TextWrapping="NoWrap" />
796+
<TextBlock
797+
Margin="10"
798+
VerticalAlignment="Center"
799+
Foreground="{DynamicResource Color05B}"
800+
Text="x" />
801+
<TextBox
802+
Height="35"
803+
MinWidth="120"
804+
Text="{Binding Settings.CustomWindowTop}"
805+
TextWrapping="NoWrap" />
806+
</StackPanel>
807+
</StackPanel>
808+
<TextBlock Style="{StaticResource Glyph}">
809+
&#xe7f4;
810+
</TextBlock>
811+
</ItemsControl>
812+
</Border>
813+
</StackPanel>
769814
</Border>
770815

771816
<Border Style="{DynamicResource SettingGroupBox}">

0 commit comments

Comments
 (0)