tsai
/
Avalonia
mirror of https://github.com/AvaloniaUI/Avalonia.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Seperated GridSplitter into HorizontalGridSplitter and VerticalGridSplitter

pull/362/head
susloparov 11 years ago
parent
ef06e79667
commit
981ec53d07
7 changed files with 138 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 194
      src/Perspex.Controls/GridSplitter.cs
  2. 2
      src/Perspex.Diagnostics/Views/LogicalTreeView.cs
  3. 2
      src/Perspex.Diagnostics/Views/VisualTreeView.cs
  4. 4
      src/Perspex.Themes.Default/DefaultTheme.paml
  5. 4
      src/Perspex.Themes.Default/HorizontalGridSplitter.paml
  6. 5
      src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
  7. 8
      src/Perspex.Themes.Default/VerticalGridSplitter.paml

194
src/Perspex.Controls/GridSplitter.cs
View File

@ -2,8 +2,8 @@
// Licensed under the MIT license. See licence.md file in the project root for full license information.
using System;
using System.Collections.Generic;
using System.Linq;
using Perspex.Collections;
using Perspex.Controls.Primitives;
using Perspex.Input;
using Perspex.VisualTree;
@ -13,17 +13,16 @@ namespace Perspex.Controls
/// <summary>
/// Unlike WPF GridSplitter, Perspex GridSplitter has only one Behavior. It's GridResizeBehavior.PreviousAndNext
/// </summary>
public class GridSplitter : Thumb
public abstract class GridSplitterBase<T> : Thumb
where T : DefinitionBase
{
private Grid _grid;
private DefinitionBase _prevDefinition;
protected PerspexList<T> _definitions;
private DefinitionBase _nextDefinition;
protected Grid _grid;
private bool _isResizingColumns;
protected T _nextDefinition;
private List<DefinitionBase> _definitions;
protected T _prevDefinition;
/// <summary>
/// Decide depending on set size
@ -42,73 +41,40 @@ namespace Perspex.Controls
throw new InvalidOperationException("GridSpliter Should have width or height set. It affects whether columns or rows it resizes");
}
private double GetActualLength(DefinitionBase definition)
{
var columnDefinition = definition as ColumnDefinition;
return columnDefinition?.ActualWidth ?? ((RowDefinition)definition).ActualHeight;
}
private double GetMinLength(DefinitionBase definition)
{
var columnDefinition = definition as ColumnDefinition;
return columnDefinition?.MinWidth ?? ((RowDefinition)definition).MinHeight;
}
private double GetMaxLength(DefinitionBase definition)
{
var columnDefinition = definition as ColumnDefinition;
return columnDefinition?.MaxWidth ?? ((RowDefinition)definition).MaxHeight;
}
private bool IsStar(DefinitionBase definition)
{
var columnDefinition = definition as ColumnDefinition;
return columnDefinition?.Width.IsStar ?? ((RowDefinition)definition).Height.IsStar;
}
protected abstract double GetActualLength(T definition);
private void SetLengthInStars(DefinitionBase definition, double value)
{
var columnDefinition = definition as ColumnDefinition;
if (columnDefinition != null)
{
columnDefinition.Width = new GridLength(value, GridUnitType.Star);
}
else
{
((RowDefinition)definition).Height = new GridLength(value, GridUnitType.Star);
}
}
protected abstract double GetMinLength(T definition);
protected abstract double GetMaxLength(T definition);
protected abstract bool IsStar(T definition);
protected abstract void SetLengthInStars(T definition, double value);
private void GetDeltaConstraints(out double min, out double max)
{
double prevDefinitionLen = GetActualLength(_prevDefinition);
double prevDefinitionMin = GetMinLength(_prevDefinition);
double prevDefinitionMax = GetMaxLength(_prevDefinition);
double nextDefinitionLen = GetActualLength(_nextDefinition);
double nextDefinitionMin = GetMinLength(_nextDefinition);
double nextDefinitionMax = GetMaxLength(_nextDefinition);
var prevDefinitionLen = GetActualLength(_prevDefinition);
var prevDefinitionMin = GetMinLength(_prevDefinition);
var prevDefinitionMax = GetMaxLength(_prevDefinition);
var nextDefinitionLen = GetActualLength(_nextDefinition);
var nextDefinitionMin = GetMinLength(_nextDefinition);
var nextDefinitionMax = GetMaxLength(_nextDefinition);
// Determine the minimum and maximum the columns can be resized
min = -Math.Min(prevDefinitionLen - prevDefinitionMin, nextDefinitionMax - nextDefinitionLen);
max = Math.Min(prevDefinitionMax - prevDefinitionLen, nextDefinitionLen - nextDefinitionMin);
}
protected override void OnDragDelta(VectorEventArgs e)
{
var delta = _isResizingColumns ? e.Vector.X : e.Vector.Y;
var delta = GetDelta(e);
double max;
double min;
GetDeltaConstraints(out min, out max);
delta = Math.Min(Math.Max(delta, min), max);
foreach (var definition in _definitions)
{
if (definition == _prevDefinition)
@ -119,35 +85,115 @@ namespace Perspex.Controls
{
SetLengthInStars(_nextDefinition, GetActualLength(_nextDefinition) - delta);
}
else if(IsStar(definition))
else if (IsStar(definition))
{
SetLengthInStars(definition, GetActualLength(definition)); // same size but in stars
}
}
}
protected abstract double GetDelta(VectorEventArgs vectorEventArgs);
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
//new Range
base.OnAttachedToVisualTree(e);
_grid = this.GetVisualParent<Grid>();
_isResizingColumns = IsResizingColumns();
if (_isResizingColumns)
{
Cursor = new Cursor(StandardCursorType.SizeWestEast);
var col = GetValue(Grid.ColumnProperty);
_definitions = _grid.ColumnDefinitions.Cast<DefinitionBase>().ToList();
_prevDefinition = _definitions[col - 1];
_nextDefinition = _definitions[col + 1];
}
else
{
Cursor = new Cursor(StandardCursorType.SizeNorthSouth);
var row = GetValue(Grid.RowProperty);
_definitions = _grid.RowDefinitions.Cast<DefinitionBase>().ToList();
_prevDefinition = _definitions[row - 1];
_nextDefinition = _definitions[row + 1];
}
}
}
}
public class HorizontalGridSplitter : GridSplitterBase<RowDefinition>
{
public HorizontalGridSplitter()
{
Cursor = new Cursor(StandardCursorType.SizeNorthSouth);
}
protected override double GetActualLength(RowDefinition definition)
{
return definition.ActualHeight;
}
protected override double GetMaxLength(RowDefinition definition)
{
return definition.MaxHeight;
}
protected override double GetMinLength(RowDefinition definition)
{
return definition.MinHeight;
}
protected override bool IsStar(RowDefinition definition)
{
return definition.Height.IsStar;
}
protected override double GetDelta(VectorEventArgs vectorEventArgs)
{
return vectorEventArgs.Vector.Y;
}
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnAttachedToVisualTree(e);
var row = GetValue(Grid.RowProperty);
_definitions = _grid.RowDefinitions;
_prevDefinition = _definitions[row - 1];
_nextDefinition = _definitions[row + 1];
}
protected override void SetLengthInStars(RowDefinition definition, double value)
{
definition.Height = new GridLength(value, GridUnitType.Star);
}
}
public class VerticalGridSplitter : GridSplitterBase<ColumnDefinition>
{
public VerticalGridSplitter()
{
Cursor = new Cursor(StandardCursorType.SizeWestEast);
}
protected override double GetActualLength(ColumnDefinition definition)
{
return definition.ActualWidth;
}
protected override double GetMaxLength(ColumnDefinition definition)
{
return definition.MaxWidth;
}
protected override double GetMinLength(ColumnDefinition definition)
{
return definition.MinWidth;
}
protected override bool IsStar(ColumnDefinition definition)
{
return definition.Width.IsStar;
}
protected override double GetDelta(VectorEventArgs vectorEventArgs)
{
return vectorEventArgs.Vector.X;
}
protected override void SetLengthInStars(ColumnDefinition definition, double value)
{
definition.Width = new GridLength(value, GridUnitType.Star);
}
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnAttachedToVisualTree(e);
var col = GetValue(Grid.ColumnProperty);
_definitions = _grid.ColumnDefinitions;
_prevDefinition = _definitions[col - 1];
_nextDefinition = _definitions[col + 1];
}
}
}

2
src/Perspex.Diagnostics/Views/LogicalTreeView.cs
View File

@ -52,7 +52,7 @@ namespace Perspex.Diagnostics.Views
},
[!ItemsControl.ItemsProperty] = this.WhenAnyValue(x => x.ViewModel.Nodes),
}),
new GridSplitter
new VerticalGridSplitter
{
[Grid.ColumnProperty] = 1,
Width = 4,

2
src/Perspex.Diagnostics/Views/VisualTreeView.cs
View File

@ -53,7 +53,7 @@ namespace Perspex.Diagnostics.Views
},
[!ItemsControl.ItemsProperty] = this.WhenAnyValue(x => x.ViewModel.Nodes),
}),
new GridSplitter
new VerticalGridSplitter
{
[Grid.ColumnProperty] = 1,
Width = 4,

4
src/Perspex.Themes.Default/DefaultTheme.paml
View File

@ -1,12 +1,12 @@
<Styles xmlns="https://github.com/perspex">
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.FocusAdorner.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.Button.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.Carousel.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.CheckBox.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ContentControl.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.DropDown.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.GridSplitter.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.VerticalGridSplitter.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.HorizontalGridSplitter.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ItemsControl.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ListBox.paml"/>
<StyleInclude Source="resource://application/Perspex.Themes.Default/Perspex.Themes.Default.ListBoxItem.paml"/>

4
src/Perspex.Themes.Default/GridSplitter.paml → src/Perspex.Themes.Default/HorizontalGridSplitter.paml
View File

@ -1,5 +1,5 @@
<Style xmlns="https://github.com/perspex" Selector="GridSplitter">
<Setter Property="Width" Value="4"/>
<Style xmlns="https://github.com/perspex" Selector="HorizontalGridSplitter">
<Setter Property="Height" Value="6"/>
<Setter Property="Template">
<ControlTemplate>
<Border Background="{TemplateBinding Background}"/>

5
src/Perspex.Themes.Default/Perspex.Themes.Default.csproj
View File

@ -119,7 +119,7 @@
<EmbeddedResource Include="FocusAdorner.paml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="GridSplitter.paml">
<EmbeddedResource Include="VerticalGridSplitter.paml">
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="ItemsControl.paml">
@ -187,6 +187,9 @@
<SubType>Designer</SubType>
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="HorizontalGridSplitter.paml" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

8
src/Perspex.Themes.Default/VerticalGridSplitter.paml
View File

@ -0,0 +1,8 @@
<Style xmlns="https://github.com/perspex" Selector="VerticalGridSplitter">
<Setter Property="Width" Value="6"/>
<Setter Property="Template">
<ControlTemplate>
<Border Background="{TemplateBinding Background}"/>
</ControlTemplate>
</Setter>
</Style>
Write Preview
Loading…
Cancel
Save