Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix "Add Asset Pop-Up" height #2517

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix "Add Asset Pop-Up" height #2517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...r/Stride.Core.Assets.Editor/Components/TemplateDescriptions/Views/AddItemUserControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
xmlns:view="clr-namespace:Stride.Core.Assets.Editor.Components.TemplateDescriptions.Views"
xmlns:viewModels="clr-namespace:Stride.Core.Assets.Editor.Components.TemplateDescriptions.ViewModels"
mc:Ignorable="d"
d:DesignHeight="300" d:DesignWidth="300">
d:DesignHeight="240" d:DesignWidth="300">
<UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
Expand All @@ -20,7 +20,7 @@
<sd:FilteringComboBox DataContext="{Binding TemplateCollection, RelativeSource={RelativeSource AncestorType=view:AddItemUserControl}}"
Text="{Binding SearchToken, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" WatermarkContent="{sd:Localize Search}"
ItemsSource="{Binding Templates}" SortMemberPath="Name" x:Name="FilteringComboBox"
ClearTextAfterValidation="True" ValidateOnLostFocus="False">
ClearTextAfterValidation="True" ValidateOnLostFocus="False" Height="240">
<sd:FilteringComboBox.Template>
<ControlTemplate TargetType="{x:Type sd:FilteringComboBox}">
<Grid>
Expand Down Expand Up @@ -123,7 +123,7 @@
</sd:FilteringComboBox.Template>
<sd:FilteringComboBox.ItemTemplate>
<DataTemplate DataType="viewModels:ITemplateDescriptionViewModel">
<DockPanel Height="56">
<DockPanel Height="52">
<Image Source="{Binding Icon}" DockPanel.Dock="Left" Width="48" Height="48" Margin="2"/>
<DockPanel Margin="18,0">
<TextBlock DockPanel.Dock="Top" FontSize="16" Text="{Binding Name}"/>
Expand Down
2 changes: 1 addition & 1 deletion sources/editor/Stride.Core.Assets.Editor/View/AssetViewUserControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@
</i:Interaction.Behaviors>
</ToggleButton>
<Popup IsOpen="{Binding IsChecked, ElementName=Toggle, Mode=TwoWay}" StaysOpen="False" AllowsTransparency="True">
<Border MinHeight="300" Margin="6" Background="{StaticResource ControlBackgroundBrush}"
<Border MinHeight="240" Margin="6" Background="{StaticResource ControlBackgroundBrush}"
BorderBrush="{StaticResource NormalBrush}" BorderThickness="1">
<Border.Effect>
<DropShadowEffect BlurRadius="5" Opacity="0.4"/>
Expand Down