Skip to content

Commit

Permalink
Move Filter Apply buttons out of scroll
Browse files Browse the repository at this point in the history
  • Loading branch information
RupertAvery committed Aug 17, 2024
1 parent 358d42b commit 5d34edf
Showing 1 changed file with 15 additions and 10 deletions.
25 changes: 15 additions & 10 deletions Diffusion.Toolkit/Pages/Search.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -615,6 +615,10 @@
<DropShadowEffect BlurRadius="15" Opacity="0.8" ShadowDepth="8" Direction="-90" RenderingBias="Quality" />
</Border.Effect>
<Grid >
<Grid.RowDefinitions>
<RowDefinition/>
<RowDefinition Height="30"/>
</Grid.RowDefinitions>
<ScrollViewer VerticalScrollBarVisibility="Auto">
<StackPanel>
<controls:FilterControl
Expand All @@ -623,18 +627,19 @@
SearchCommand="{Binding FilterCommand}"

VerticalAlignment="Stretch"/>
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Button Grid.Column="0" Height="30" Command="{Binding ClearCommand}">Clear</Button>
<Button Grid.Column="1" Height="30" Command="{Binding FilterCommand}">Apply (CTRL+Enter)</Button>
<Button Grid.Column="2" Height="30" Command="{Binding HideFilter}">Close</Button>
</Grid>

</StackPanel>
</ScrollViewer>
<Grid Grid.Row="1">
<Grid.ColumnDefinitions>
<ColumnDefinition/>
<ColumnDefinition/>
<ColumnDefinition/>
</Grid.ColumnDefinitions>
<Button Grid.Column="0" Height="30" Command="{Binding ClearCommand}">Clear</Button>
<Button Grid.Column="1" Height="30" Command="{Binding FilterCommand}">Apply (CTRL+Enter)</Button>
<Button Grid.Column="2" Height="30" Command="{Binding HideFilter}">Close</Button>
</Grid>
</Grid>
</Border>
</Popup>
Expand Down

0 comments on commit 5d34edf

Please sign in to comment.