Browse Source

More cleanup.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4773 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 16 years ago
parent
commit
bb8f2e52dd
  1. 6
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml
  2. 4
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ZoomControl.cs
  3. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs
  4. 2
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignSurface.xaml
  5. 6
      src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.xaml

6
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ControlStyles.xaml

@ -44,11 +44,7 @@
<ScrollViewer x:Name="scrollViewer" <ScrollViewer x:Name="scrollViewer"
HorizontalScrollBarVisibility="Visible" HorizontalScrollBarVisibility="Visible"
VerticalScrollBarVisibility="Visible"> VerticalScrollBarVisibility="Visible">
<Border x:Name="container" <ContentPresenter x:Name="container" />
VerticalAlignment="Center"
HorizontalAlignment="Center">
<ContentPresenter />
</Border>
</ScrollViewer> </ScrollViewer>
<StackPanel Orientation="Vertical" <StackPanel Orientation="Vertical"
HorizontalAlignment="Left" HorizontalAlignment="Left"

4
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/Controls/ZoomControl.cs

@ -47,7 +47,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
double startVericalOffset; double startVericalOffset;
internal ScrollViewer ScrollViewer; internal ScrollViewer ScrollViewer;
Border container; FrameworkElement container;
ScaleTransform transform; ScaleTransform transform;
Point startPoint; Point startPoint;
bool isMouseDown; bool isMouseDown;
@ -74,7 +74,7 @@ namespace ICSharpCode.WpfDesign.Designer.Controls
base.OnApplyTemplate(); base.OnApplyTemplate();
ScrollViewer = (ScrollViewer)Template.FindName("scrollViewer", this); ScrollViewer = (ScrollViewer)Template.FindName("scrollViewer", this);
container = (Border)Template.FindName("container", this); container = (FrameworkElement)Template.FindName("container", this);
transform = new ScaleTransform(); transform = new ScaleTransform();
container.LayoutTransform = transform; container.LayoutTransform = transform;

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignPanel.cs

@ -141,8 +141,6 @@ namespace ICSharpCode.WpfDesign.Designer
public DesignPanel() public DesignPanel()
{ {
this.Focusable = true; this.Focusable = true;
this.VerticalAlignment = VerticalAlignment.Top;
this.HorizontalAlignment = HorizontalAlignment.Left;
this.AllowDrop = true; this.AllowDrop = true;
DesignerProperties.SetIsInDesignMode(this, true); DesignerProperties.SetIsInDesignMode(this, true);

2
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/DesignSurface.xaml

@ -5,11 +5,9 @@
xmlns:Controls="clr-namespace:ICSharpCode.WpfDesign.Designer.Controls" xmlns:Controls="clr-namespace:ICSharpCode.WpfDesign.Designer.Controls"
DataContext="{x:Null}" DataContext="{x:Null}"
Background="#888"> Background="#888">
<Controls:ZoomControl x:Name="uxZoom"> <Controls:ZoomControl x:Name="uxZoom">
<Default:DesignPanel x:Name="_designPanel"> <Default:DesignPanel x:Name="_designPanel">
<Border x:Name="_sceneContainer" /> <Border x:Name="_sceneContainer" />
</Default:DesignPanel> </Default:DesignPanel>
</Controls:ZoomControl> </Controls:ZoomControl>
</UserControl> </UserControl>

6
src/AddIns/DisplayBindings/WpfDesign/WpfDesign.Designer/Project/PropertyGrid/PropertyGridView.xaml

@ -209,7 +209,7 @@
</DockPanel> </DockPanel>
<Border BorderThickness="1 0 0 0" <Border BorderThickness="1 0 0 0"
BorderBrush="{x:Static SystemColors.ControlBrush}"> BorderBrush="{x:Static SystemColors.ControlBrush}">
<ContentPresenter x:Name="editorConatiner" <ContentPresenter x:Name="editorContainer"
Content="{Binding Editor}" Content="{Binding Editor}"
VerticalAlignment="Center" VerticalAlignment="Center"
Margin="3 0" /> Margin="3 0" />
@ -229,10 +229,10 @@
<DataTemplate.Triggers> <DataTemplate.Triggers>
<DataTrigger Binding="{Binding IsEnabled}" <DataTrigger Binding="{Binding IsEnabled}"
Value="False"> Value="False">
<Setter TargetName="editorConatiner" <Setter TargetName="editorContainer"
Property="Opacity" Property="Opacity"
Value="0.5" /> Value="0.5" />
<Setter TargetName="editorConatiner" <Setter TargetName="editorContainer"
Property="IsHitTestVisible" Property="IsHitTestVisible"
Value="False" /> Value="False" />
</DataTrigger> </DataTrigger>

Loading…
Cancel
Save