Changement après fusion

master
thchazot1 3 years ago
parent c8556dcd4b
commit 48c01a70ac

@ -17,7 +17,7 @@
<ComboBoxItem Tag="Océans" x:Name="Indien" >Indien</ComboBoxItem> <ComboBoxItem Tag="Océans" x:Name="Indien" >Indien</ComboBoxItem>
<ComboBoxItem Tag="Océans" x:Name="Pacifique" >Pacifique</ComboBoxItem> <ComboBoxItem Tag="Océans" x:Name="Pacifique" >Pacifique</ComboBoxItem>
</ComboBox> </ComboBox>
<TextBox DockPanel.Dock="Top" Text="Rechercher" FontFamily="{StaticResource Police1}" Foreground="{StaticResource Couleur1}" Height="25" Margin="5" x:Name="Rechercher" VerticalContentAlignment="Center"/> <TextBox DockPanel.Dock="Top" Text="Rechercher" FontFamily="{StaticResource Police1}" Foreground="{StaticResource Couleur1}" Height="25" Margin="5" x:Name="Rechercher" VerticalContentAlignment="Center" IsKeyboardFocusedChanged="TextBox_IsKeyboardFocusedChanged"/>
<ListBox Background="{StaticResource Couleur3}"> <ListBox Background="{StaticResource Couleur3}">
<local:UserControlRequin/> <local:UserControlRequin/>
<local:UserControlRequin/> <local:UserControlRequin/>

@ -29,5 +29,10 @@ namespace WpfApp1
{ {
((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapAcc(); ((MainWindow)System.Windows.Application.Current.MainWindow).ContentControlSwapAcc();
} }
private void edit_Click(object sender, RoutedEventArgs e)
{
}
} }
} }

Loading…
Cancel
Save