prehistoric-systems/Flow.Launcher
1
0
Fork 0
mirror of https://github.com/Flow-Launcher/Flow.Launcher.git synced 2026-03-11 08:54:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Bind width to preview

Browse source
This commit is contained in:
Kevin Zhang 2021-10-22 15:26:13 -05:00
parent a83f9df19c
commit 9d3096050f
2 changed files with 124 additions and 132 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

226
Flow.Launcher/SettingWindow.xaml
View file

@ -457,32 +457,32 @@
</Border> </Border>
<Border BorderThickness="1 2 0 0" BorderBrush="#f3f3f3" Grid.Column="2" Grid.RowSpan="2" Padding="12 12 12 12"> <Border BorderThickness="1 2 0 0" BorderBrush="#f3f3f3" Grid.Column="2" Grid.RowSpan="2" Padding="12 12 12 12">
<Grid Grid.Column="1" Grid.RowSpan="2"> <Grid Grid.Column="1" Grid.RowSpan="2">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="*" /> <RowDefinition Height="*" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<ContentControl DataContext="{Binding Path=SelectedPlugin}" <ContentControl DataContext="{Binding Path=SelectedPlugin}"
Grid.ColumnSpan="1" Grid.Row="0" Margin="10 10 10 0"> Grid.ColumnSpan="1" Grid.Row="0" Margin="10 10 10 0">
<Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch"> <Grid HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="48" /> <ColumnDefinition Width="48" />
<ColumnDefinition /> <ColumnDefinition />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
<RowDefinition/> <RowDefinition/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
<Image Source="{Binding Image, IsAsync=True}" <Image Source="{Binding Image, IsAsync=True}"
Width="48" Height="48" Width="48" Height="48"
HorizontalAlignment="Left" VerticalAlignment="Top" HorizontalAlignment="Left" VerticalAlignment="Top"
Grid.RowSpan="2"/> Grid.RowSpan="2"/>
<Grid Grid.Row="0" Grid.Column="1" <Grid Grid.Row="0" Grid.Column="1"
Margin="20,0,0,0"> Margin="20,0,0,0">
<TextBlock Text="{Binding PluginPair.Metadata.Name}" <TextBlock Text="{Binding PluginPair.Metadata.Name}"
Grid.Column="0" Grid.Column="0"
Cursor="Hand" MouseUp="OnPluginNameClick" FontSize="24" Cursor="Hand" MouseUp="OnPluginNameClick" FontSize="24"
HorizontalAlignment="Left"> HorizontalAlignment="Left">
@ -494,63 +494,63 @@
</TextBlock> </TextBlock>
</ToolTipService.ToolTip> </ToolTipService.ToolTip>
</TextBlock> </TextBlock>
<ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}" <ui:ToggleSwitch Grid.Column="1" OffContent="{DynamicResource disable}" OnContent="{DynamicResource enable}"
MaxWidth="110" HorizontalAlignment="Right" MaxWidth="110" HorizontalAlignment="Right"
IsOn="{Binding PluginState}"/> IsOn="{Binding PluginState}"/>
</Grid> </Grid>
<TextBlock Margin="20,0,0,0" <TextBlock Margin="20,0,0,0"
Text="{Binding PluginPair.Metadata.Description}" Text="{Binding PluginPair.Metadata.Description}"
Grid.Row="1" Opacity="0.5" Grid.Column="2" /> Grid.Row="1" Opacity="0.5" Grid.Column="2" />
<DockPanel Grid.ColumnSpan="2" Grid.Row="2" Margin="0 10 0 8" HorizontalAlignment="Right"> <DockPanel Grid.ColumnSpan="2" Grid.Row="2" Margin="0 10 0 8" HorizontalAlignment="Right">
<TextBlock Text="{DynamicResource priority}" Margin="15,0,0,0" MaxWidth="100"/> <TextBlock Text="{DynamicResource priority}" Margin="15,0,0,0" MaxWidth="100"/>
<TextBlock Text="{Binding Priority}" <TextBlock Text="{Binding Priority}"
ToolTip="Change Plugin Results Priority" ToolTip="Change Plugin Results Priority"
Margin="5 0 0 0" Cursor="Hand" Foreground="Blue" Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
MouseUp="OnPluginPriorityClick"/> MouseUp="OnPluginPriorityClick"/>
<TextBlock Text="{DynamicResource actionKeywords}" <TextBlock Text="{DynamicResource actionKeywords}"
Visibility="{Binding ActionKeywordsVisibility}" Visibility="{Binding ActionKeywordsVisibility}"
Margin="5 0 0 0"/> Margin="5 0 0 0"/>
<TextBlock Text="{Binding ActionKeywordsText}" <TextBlock Text="{Binding ActionKeywordsText}"
Visibility="{Binding ActionKeywordsVisibility}" Visibility="{Binding ActionKeywordsVisibility}"
ToolTip="Change Action Keywords" ToolTip="Change Action Keywords"
Margin="5 0 0 0" Cursor="Hand" Foreground="Blue" Margin="5 0 0 0" Cursor="Hand" Foreground="Blue"
MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" /> MouseUp="OnPluginActionKeywordsClick" MaxWidth="100" />
<TextBlock Text="{DynamicResource plugin_init_time}" Margin="10 0 0 0" MaxWidth="100"/> <TextBlock Text="{DynamicResource plugin_init_time}" Margin="10 0 0 0" MaxWidth="100"/>
<TextBlock Text="{Binding InitilizaTime}" Margin="5 0 0 0" MaxWidth="100"/> <TextBlock Text="{Binding InitilizaTime}" Margin="5 0 0 0" MaxWidth="100"/>
<TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/> <TextBlock Text="{DynamicResource plugin_query_time}" Margin="10 0 0 0" MaxWidth="100"/>
<TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/> <TextBlock Text="{Binding QueryTime}" Margin="5 0 0 0" MaxWidth="100"/>
<TextBlock Text="{DynamicResource pluginDirectory}" <TextBlock Text="{DynamicResource pluginDirectory}"
MaxWidth="120" Cursor="Hand" Margin="10,0,0,0" MaxWidth="120" Cursor="Hand" Margin="10,0,0,0"
MouseUp="OnPluginDirecotyClick" Foreground="Blue" /> MouseUp="OnPluginDirecotyClick" Foreground="Blue" />
</DockPanel> </DockPanel>
</Grid> </Grid>
</ContentControl> </ContentControl>
<ContentControl Content="{Binding SettingProvider}" <ContentControl Content="{Binding SettingProvider}"
Grid.ColumnSpan="1" Grid.Row="1" Grid.ColumnSpan="1" Grid.Row="1"
HorizontalAlignment="Stretch" VerticalAlignment="Stretch" /> HorizontalAlignment="Stretch" VerticalAlignment="Stretch" />
</Grid> </Grid>
</Border> </Border>
</Grid> </Grid>
</TabItem> </TabItem>
<TabItem> <TabItem>
<TabItem.Header> <TabItem.Header>
<Grid> <Grid>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/> <ColumnDefinition Width="Auto"/>
<ColumnDefinition/> <ColumnDefinition/>
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Margin="0 0 12 0">&#xe790;</TextBlock> <TextBlock Grid.Column="0" FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Margin="0 0 12 0">&#xe790;</TextBlock>
<TextBlock Grid.Column="1" Text="{DynamicResource theme}"></TextBlock> <TextBlock Grid.Column="1" Text="{DynamicResource theme}"></TextBlock>
</Grid> </Grid>
</TabItem.Header> </TabItem.Header>
<Border Padding=" 0 0 0 0 "> <Border Padding=" 0 0 0 0 ">
<ScrollViewer ScrollViewer.CanContentScroll="False" ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}" Margin="0,0,0,0" Background="#f3f3f3" Padding="0 0 18 0"> <ScrollViewer ScrollViewer.CanContentScroll="False" ui:ScrollViewerHelper.AutoHideScrollBars="{Binding AutoHideScrollBar, Mode=OneWay}" Margin="0,0,0,0" Background="#f3f3f3" Padding="0 0 18 0">
<Grid Margin="0 0 0 0" Background="#f3f3f3"> <Grid Margin="0 0 0 0" Background="#f3f3f3">
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="0" /> <RowDefinition Height="0" />
<RowDefinition Height="350"/> <RowDefinition Height="*"/>
<RowDefinition Height="80"/> <RowDefinition Height="*"/>
<RowDefinition /> <RowDefinition />
<RowDefinition Height="*"/> <RowDefinition Height="*"/>
</Grid.RowDefinitions> </Grid.RowDefinitions>
@ -561,7 +561,7 @@
<StackPanel Background="{Binding PreviewBackground}" Grid.Row="1" Margin="0"> <StackPanel Background="{Binding PreviewBackground}" Grid.Row="1" Margin="0">
<StackPanel Orientation="Horizontal" Margin="0 30 0 0" <StackPanel Orientation="Horizontal" Margin="0 30 0 0"
HorizontalAlignment="Center" VerticalAlignment="Center"> HorizontalAlignment="Center" VerticalAlignment="Center">
<Border Width="500" Style="{DynamicResource WindowBorderStyle}" > <Border Width="{Binding WindowWidthSize}" Style="{DynamicResource WindowBorderStyle}" >
<Border Style="{DynamicResource WindowRadius}"> <Border Style="{DynamicResource WindowRadius}">
<Border.Clip> <Border.Clip>
<MultiBinding Converter="{StaticResource BorderClipConverter}"> <MultiBinding Converter="{StaticResource BorderClipConverter}">
@ -587,7 +587,7 @@
</Canvas> </Canvas>
<Border Margin="0 0 0 0" Grid.Row="1"> <Border Margin="0 0 0 0" Grid.Row="1">
<Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" Visibility="visible"/> <Rectangle Width="Auto" HorizontalAlignment="Stretch" Style="{DynamicResource SeparatorStyle}" Visibility="Visible"/>
</Border> </Border>
<ContentControl Grid.Row="2"> <ContentControl Grid.Row="2">
@ -600,6 +600,35 @@
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="2" Orientation="Vertical">
<Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0">
<ItemsControl Style="{StaticResource SettingGrid}">
<StackPanel Style="{StaticResource TextPanel}">
<TextBlock Text="{DynamicResource queryWindowShadowEffect}" Style="{DynamicResource SettingTitleLabel}" />
<TextBlock Text="{DynamicResource shadowEffectCPUUsage}" Style="{DynamicResource SettingSubTitleLabel}" />
</StackPanel>
<ui:ToggleSwitch IsOn="{Binding DropShadowEffect, Mode=TwoWay}" Width="80" Grid.Column="2" Grid.Row="0" Margin="0 0 18 0"/>
<TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
&#xeb91;
</TextBlock>
</ItemsControl>
</Border>
<Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 18">
<ItemsControl Style="{StaticResource SettingGrid}">
<StackPanel Style="{StaticResource TextPanel}">
<TextBlock Text="{DynamicResource windowWidthSize}" Style="{DynamicResource SettingTitleLabel}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="2">
<TextBlock Text="{Binding ElementName=WindowWidthValue, Path=Value, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" TextAlignment="Right" Width="100" Margin="0 0 8 2"/>
<Slider Name="WindowWidthValue" Value="{Binding WindowWidthSize, Mode=TwoWay}" IsMoveToPointEnabled="True" Maximum="900" Minimum="400" Margin="0,0,18,0" TickFrequency="10" IsSnapToTickEnabled="True" Width="300"/>
</StackPanel>
<TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
&#xe740;
</TextBlock>
</ItemsControl>
</Border>
</StackPanel>
<StackPanel Grid.Row="3"> <StackPanel Grid.Row="3">
<Border Style="{DynamicResource SettingGroupBox}" Margin="0 8 0 0" Padding="0" HorizontalAlignment="Stretch"> <Border Style="{DynamicResource SettingGroupBox}" Margin="0 8 0 0" Padding="0" HorizontalAlignment="Stretch">
<ListBox ItemsSource="{Binding Themes}" SelectedItem="{Binding SelectedTheme}" ui:ScrollViewerHelper.AutoHideScrollBars="True" <ListBox ItemsSource="{Binding Themes}" SelectedItem="{Binding SelectedTheme}" ui:ScrollViewerHelper.AutoHideScrollBars="True"
@ -656,40 +685,7 @@
</TextBlock> </TextBlock>
</Border> </Border>
</StackPanel> </StackPanel>
<StackPanel Grid.Row="2">
<Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 0">
<ItemsControl Style="{StaticResource SettingGrid}">
<StackPanel Style="{StaticResource TextPanel}">
<TextBlock Text="{DynamicResource queryWindowShadowEffect}" Style="{DynamicResource SettingTitleLabel}" />
<TextBlock Text="{DynamicResource shadowEffectCPUUsage}" Style="{DynamicResource SettingSubTitleLabel}" />
</StackPanel>
<ui:ToggleSwitch IsOn="{Binding DropShadowEffect, Mode=TwoWay}" Width="80" Grid.Column="2" Grid.Row="0" Margin="0 0 18 0"/>
<TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
&#xeb91;
</TextBlock>
</ItemsControl>
</Border>
</StackPanel>
<StackPanel Grid.Row="4" Margin="0 0 0 10" Orientation="Vertical"> <StackPanel Grid.Row="4" Margin="0 0 0 10" Orientation="Vertical">
<Border Style="{DynamicResource SettingGroupBox}" Margin="0 12 0 18">
<ItemsControl Style="{StaticResource SettingGrid}">
<StackPanel Style="{StaticResource TextPanel}">
<TextBlock Text="{DynamicResource windowWidthSize}" Style="{DynamicResource SettingTitleLabel}"/>
</StackPanel>
<StackPanel Orientation="Horizontal" Grid.Column="2">
<TextBlock Text="{Binding ElementName=WindowWidthValue, Path=Value, UpdateSourceTrigger=PropertyChanged}" VerticalAlignment="Center" TextAlignment="Right" Width="100" Margin="0 0 8 2"/>
<Slider Name="WindowWidthValue" Value="{Binding WindowWidthSize, Mode=TwoWay}" IsMoveToPointEnabled="True" Maximum="900" Minimum="400" Margin="0,0,18,0" TickFrequency="10" IsSnapToTickEnabled="True" Width="300"/>
</StackPanel>
<TextBlock FontFamily="/Resources/#Segoe Fluent Icons" FontSize="20" Grid.Column="0" VerticalAlignment="Center" Margin="24 0 16 0">
&#xe740;
</TextBlock>
</ItemsControl>
</Border>
<Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5" Margin="0 30 0 0"> <Border Style="{DynamicResource SettingGroupBox}" Padding="0" CornerRadius="5" Margin="0 30 0 0">
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0"> <Border Style="{DynamicResource SettingGroupBox}" Margin="0" BorderThickness="0">
@ -977,53 +973,53 @@
</Grid> </Grid>
</TabItem.Header> </TabItem.Header>
<Border Background="#f3f3f3"> <Border Background="#f3f3f3">
<Grid Height="400" Margin="65,0"> <Grid Height="400" Margin="65,0">
<!--<TextBlock Text="{DynamicResource about}" Grid.Row="0" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/> --> <!--<TextBlock Text="{DynamicResource about}" Grid.Row="0" TextAlignment="left" FontSize="30" Margin="0 5 0 5"/> -->
<Grid.Resources> <Grid.Resources>
<Style TargetType="{x:Type TextBlock}"> <Style TargetType="{x:Type TextBlock}">
<Setter Property="Margin" Value="10, 25, 0, 0" /> <Setter Property="Margin" Value="10, 25, 0, 0" />
<Setter Property="FontSize" Value="14" /> <Setter Property="FontSize" Value="14" />
</Style> </Style>
</Grid.Resources> </Grid.Resources>
<Grid.ColumnDefinitions> <Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Grid.RowDefinitions> <Grid.RowDefinitions>
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
<RowDefinition Height="Auto" /> <RowDefinition Height="Auto" />
</Grid.RowDefinitions> </Grid.RowDefinitions>
<TextBlock Grid.Row="0" Grid.ColumnSpan="2" Text="{Binding ActivatedTimes, Mode=OneWay}" FontSize="12" /> <TextBlock Grid.Row="0" Grid.ColumnSpan="2" Text="{Binding ActivatedTimes, Mode=OneWay}" FontSize="12" />
<TextBlock Grid.Row="1" Grid.Column="0" Text="{DynamicResource website}"/> <TextBlock Grid.Row="1" Grid.Column="0" Text="{DynamicResource website}"/>
<TextBlock Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left"> <TextBlock Grid.Row="1" Grid.Column="1" HorizontalAlignment="Left">
<Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate"> <Hyperlink NavigateUri="{Binding Website, Mode=OneWay}" RequestNavigate="OnRequestNavigate">
<Run Text="{Binding Website, Mode=OneWay}" /> <Run Text="{Binding Website, Mode=OneWay}" />
</Hyperlink> </Hyperlink>
</TextBlock> </TextBlock>
<TextBlock Grid.Row="2" Grid.Column="0" Text="Version" /> <TextBlock Grid.Row="2" Grid.Column="0" Text="Version" />
<TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Version}" /> <TextBlock Grid.Row="2" Grid.Column="1" Text="{Binding Version}" />
<TextBlock Grid.Row="3" Grid.Column="0" Text="{DynamicResource releaseNotes}" /> <TextBlock Grid.Row="3" Grid.Column="0" Text="{DynamicResource releaseNotes}" />
<TextBlock Grid.Row="3" Grid.Column="1"> <TextBlock Grid.Row="3" Grid.Column="1">
<Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}" <Hyperlink NavigateUri="{Binding ReleaseNotes, Mode=OneWay}"
RequestNavigate="OnRequestNavigate"> RequestNavigate="OnRequestNavigate">
<Run Text="{Binding ReleaseNotes, Mode=OneWay}" /> <Run Text="{Binding ReleaseNotes, Mode=OneWay}" />
</Hyperlink> </Hyperlink>
</TextBlock> </TextBlock>
<TextBlock Grid.Row="4" Grid.Column="0" Text="{DynamicResource documentation}" /> <TextBlock Grid.Row="4" Grid.Column="0" Text="{DynamicResource documentation}" />
<TextBlock Grid.Row="4" Grid.Column="1"> <TextBlock Grid.Row="4" Grid.Column="1">
<Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}" <Hyperlink NavigateUri="{Binding Documentation, Mode=OneWay}"
RequestNavigate="OnRequestNavigate"> RequestNavigate="OnRequestNavigate">
<Run Text="{Binding Documentation, Mode=OneWay}" /> <Run Text="{Binding Documentation, Mode=OneWay}" />
</Hyperlink> </Hyperlink>
</TextBlock> </TextBlock>
<Button Grid.Row="5" Grid.Column="0" <Button Grid.Row="5" Grid.Column="0"
Content="{DynamicResource checkUpdates}" Click="OnCheckUpdates" Content="{DynamicResource checkUpdates}" Click="OnCheckUpdates"
HorizontalAlignment="Left" Margin="10 30 10 10" /> HorizontalAlignment="Left" Margin="10 30 10 10" />
</Grid> </Grid>
</Border> </Border>
</TabItem> </TabItem>
</TabControl> </TabControl>

6
Flow.Launcher/ViewModel/SettingWindowViewModel.cs
View file

@ -309,11 +309,7 @@ namespace Flow.Launcher.ViewModel
public double WindowWidthSize public double WindowWidthSize
{ {
get => Settings.WindowSize; get => Settings.WindowSize;
set set => Settings.WindowSize = value;
{
Settings.WindowSize = value;
Application.Current.MainWindow.Visibility = Visibility.Visible;
}
} }
public bool UseGlyphIcons public bool UseGlyphIcons