patch 5590 from http://odyssey.codeplex.com/SourceControl/list/patches

fixes: http://odyssey.codeplex.com/workitem/5776
jogibear9988 · Jun 24, 2014 · 71096f4 · 71096f4
1 parent 1b2ede1
commit 71096f4
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/Odyssey/Odyssey/Themes/Ribbon/RibbonComboBox.xaml b/Odyssey/Odyssey/Themes/Ribbon/RibbonComboBox.xaml
@@ -44,14 +44,14 @@
                             MaxHeight="{TemplateBinding ComboBox.MaxDropDownHeight}">
                         <Border BorderThickness="1,1,1,1" BorderBrush="{DynamicResource {x:Static SystemColors.WindowFrameBrushKey}}"
                                 Background="{DynamicResource {x:Static SystemColors.WindowBrushKey}}" Name="DropDownBorder">
-                            <StackPanel>
-                                <ContentControl Content="{TemplateBinding DropDownHeader}" ContentTemplate="{TemplateBinding DropDownHeaderTemplate}" />
+                            <DockPanel>
+                                <ContentControl Content="{TemplateBinding DropDownHeader}" ContentTemplate="{TemplateBinding DropDownHeaderTemplate}" DockPanel.Dock="Top" />
+                                <ContentControl Content="{TemplateBinding DropDownFooter}" ContentTemplate="{TemplateBinding DropDownFooterTemplate}" DockPanel.Dock="Bottom" />
                                 <ScrollViewer VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Disabled" CanContentScroll="True">
                                     <ItemsPresenter SnapsToDevicePixels="{TemplateBinding UIElement.SnapsToDevicePixels}"
                                             KeyboardNavigation.DirectionalNavigation="Contained" Margin="1" />
                                 </ScrollViewer>
-                                <ContentControl Content="{TemplateBinding DropDownFooter}" ContentTemplate="{TemplateBinding DropDownFooterTemplate}" />
-                            </StackPanel>
+                            </DockPanel>
                         </Border>
                     </mwt:SystemDropShadowChrome>
                 </Popup>