Browse Source

Fixed ResourceDictionary merging in DebuggerTooltipControl.xaml

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@5185 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
David Srbecký 16 years ago
parent
commit
3e08e3dee5
  1. 12
      src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerTooltipControl.xaml

12
src/Main/Base/Project/Src/Services/Debugger/Tooltips/DebuggerTooltipControl.xaml

@ -5,9 +5,11 @@
xmlns:debugging="clr-namespace:ICSharpCode.SharpDevelop.Debugging" xmlns:debugging="clr-namespace:ICSharpCode.SharpDevelop.Debugging"
> >
<UserControl.Resources> <UserControl.Resources>
<ResourceDictionary>
<ResourceDictionary Source="VisualizerPicker.xaml" /> <ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="VisualizerPicker.xaml" />
</ResourceDictionary.MergedDictionaries>
<!-- TODO move styles to ResourceDictionary --> <!-- TODO move styles to ResourceDictionary -->
<Style x:Key="ExpandCollapseToggleStyle" <Style x:Key="ExpandCollapseToggleStyle"
TargetType="{x:Type ToggleButton}"> TargetType="{x:Type ToggleButton}">
@ -93,8 +95,8 @@
</Setter.Value> </Setter.Value>
</Setter> </Setter>
</Style> </Style>
</ResourceDictionary>
</UserControl.Resources> </UserControl.Resources>
<StackPanel Orientation="Vertical"> <StackPanel Orientation="Vertical">
<RepeatButton Name="btnUp" Focusable="False" Style="{StaticResource upButtonStyle}" Content="^" Click="BtnUp_Click"></RepeatButton> <RepeatButton Name="btnUp" Focusable="False" Style="{StaticResource upButtonStyle}" Content="^" Click="BtnUp_Click"></RepeatButton>
<DataGrid VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Disabled" <DataGrid VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Disabled"

Loading…
Cancel
Save