Browse Source
- Fix a bug in grid adorner where incorrect margins were calculated. - clean-up in margin handle. - change change group scheme for in-place editor to Enter for changes, Shift+Enter for newline and Esc for cancelling as suggested by Siegfried. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6398 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61pull/1/head
Kumar Devvrat
16 years ago
10 changed files with 888 additions and 566 deletions
@ -0,0 +1,102 @@ |
|||||||
|
// <file>
|
||||||
|
// <copyright see="prj:///doc/copyright.txt"/>
|
||||||
|
// <license see="prj:///doc/license.txt"/>
|
||||||
|
// <author name="Kumar Devvrat"/>
|
||||||
|
// <version>$Revision: $</version>
|
||||||
|
// </file>
|
||||||
|
using System; |
||||||
|
using NUnit.Framework; |
||||||
|
|
||||||
|
namespace ICSharpCode.WpfDesign.Tests.Designer |
||||||
|
{ |
||||||
|
[TestFixture] |
||||||
|
public class FocusNavigationTests : ModelTestHelper |
||||||
|
{ |
||||||
|
[Test] |
||||||
|
public void SingleChildHierarchyFocusForward() |
||||||
|
{ |
||||||
|
var grid = CreateGridContextWithDesignSurface("<Button><Button/></Button>"); |
||||||
|
var firstButton = grid.ContentProperty.CollectionElements[0]; |
||||||
|
var secondButton = firstButton.ContentProperty.Value; |
||||||
|
|
||||||
|
var selection = grid.Services.Selection; |
||||||
|
selection.SetSelectedComponents(new[] {grid}); |
||||||
|
var focusNavigator = new MockFocusNavigator(grid.Context); |
||||||
|
|
||||||
|
/* Move focus forward Tab */ |
||||||
|
focusNavigator.MoveFocusForward(); |
||||||
|
Assert.AreEqual(firstButton, selection.PrimarySelection); |
||||||
|
focusNavigator.MoveFocusForward(); |
||||||
|
Assert.AreEqual(secondButton, selection.PrimarySelection); |
||||||
|
focusNavigator.MoveFocusForward(); |
||||||
|
Assert.AreEqual(grid, selection.PrimarySelection); |
||||||
|
} |
||||||
|
|
||||||
|
[Test] |
||||||
|
public void SingleChildHierarchyFocusBack() |
||||||
|
{ |
||||||
|
var grid = CreateGridContextWithDesignSurface("<Button><Button/></Button>"); |
||||||
|
var firstButton = grid.ContentProperty.CollectionElements[0]; |
||||||
|
var secondButton = firstButton.ContentProperty.Value; |
||||||
|
|
||||||
|
var selection = grid.Services.Selection; |
||||||
|
selection.SetSelectedComponents(new[] {grid}); |
||||||
|
var focusNavigator = new MockFocusNavigator(grid.Context); |
||||||
|
|
||||||
|
/* Move focus back Shift + Tab */ |
||||||
|
focusNavigator.MoveFocusBack(); |
||||||
|
Assert.AreEqual(secondButton, selection.PrimarySelection); |
||||||
|
focusNavigator.MoveFocusBack(); |
||||||
|
Assert.AreEqual(firstButton, selection.PrimarySelection); |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
[Test] |
||||||
|
public void MultipleChildHierarchyFocusForward() |
||||||
|
{ |
||||||
|
var grid = CreateGridContextWithDesignSurface("<Button/><Grid><Button/></Grid>"); |
||||||
|
var firstButton = grid.ContentProperty.CollectionElements[0]; |
||||||
|
var innerGrid = grid.ContentProperty.CollectionElements[1]; |
||||||
|
var innerGridButton = innerGrid.ContentProperty.CollectionElements[0]; |
||||||
|
|
||||||
|
var selection = grid.Services.Selection; |
||||||
|
selection.SetSelectedComponents(new[] { grid }); |
||||||
|
var focusNavigator = new MockFocusNavigator(grid.Context); |
||||||
|
|
||||||
|
/* Move focus forward Tab */ |
||||||
|
focusNavigator.MoveFocusForward(); |
||||||
|
Assert.AreEqual(firstButton, selection.PrimarySelection); |
||||||
|
focusNavigator.MoveFocusForward(); |
||||||
|
Assert.AreEqual(innerGrid, selection.PrimarySelection); |
||||||
|
focusNavigator.MoveFocusForward(); |
||||||
|
Assert.AreEqual(innerGridButton, selection.PrimarySelection); |
||||||
|
focusNavigator.MoveFocusForward(); |
||||||
|
Assert.AreEqual(grid, selection.PrimarySelection); |
||||||
|
} |
||||||
|
|
||||||
|
[Test] |
||||||
|
public void MultipleChildHierarchyFocusBack() |
||||||
|
{ |
||||||
|
var grid = CreateGridContextWithDesignSurface("<Button/><Grid><Button/></Grid>"); |
||||||
|
var firstButton = grid.ContentProperty.CollectionElements[0]; |
||||||
|
var innerGrid = grid.ContentProperty.CollectionElements[1]; |
||||||
|
var innerGridButton = innerGrid.ContentProperty.CollectionElements[0]; |
||||||
|
|
||||||
|
var selection = grid.Services.Selection; |
||||||
|
selection.SetSelectedComponents(new[] { grid }); |
||||||
|
var focusNavigator = new MockFocusNavigator(grid.Context); |
||||||
|
|
||||||
|
/* Move focus back Shift + Tab */ |
||||||
|
focusNavigator.MoveFocusBack(); |
||||||
|
Assert.AreEqual(innerGridButton, selection.PrimarySelection); |
||||||
|
focusNavigator.MoveFocusBack(); |
||||||
|
Assert.AreEqual(innerGrid, selection.PrimarySelection); |
||||||
|
focusNavigator.MoveFocusBack(); |
||||||
|
Assert.AreEqual(firstButton, selection.PrimarySelection); |
||||||
|
focusNavigator.MoveFocusBack(); |
||||||
|
Assert.AreEqual(grid, selection.PrimarySelection); |
||||||
|
focusNavigator.MoveFocusBack(); |
||||||
|
Assert.AreEqual(innerGridButton, selection.PrimarySelection); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
@ -0,0 +1,124 @@ |
|||||||
|
// <file>
|
||||||
|
// <copyright see="prj:///doc/copyright.txt"/>
|
||||||
|
// <license see="prj:///doc/license.txt"/>
|
||||||
|
// <author name="Kumar Devvrat"/>
|
||||||
|
// <version>$Revision: $</version>
|
||||||
|
// </file>
|
||||||
|
using System; |
||||||
|
using System.Linq; |
||||||
|
using ICSharpCode.WpfDesign.Designer; |
||||||
|
|
||||||
|
namespace ICSharpCode.WpfDesign.Tests.Designer |
||||||
|
{ |
||||||
|
internal class MockFocusNavigator |
||||||
|
{ |
||||||
|
private readonly DesignContext _context; |
||||||
|
|
||||||
|
internal MockFocusNavigator(DesignContext context) |
||||||
|
{ |
||||||
|
_context = context; |
||||||
|
} |
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Moves the Focus down the tree.
|
||||||
|
/// </summary>
|
||||||
|
internal void MoveFocusForward() |
||||||
|
{ |
||||||
|
ISelectionService selection = _context.Services.Selection; |
||||||
|
DesignItem item = selection.PrimarySelection; |
||||||
|
selection.SetSelectedComponents(selection.SelectedItems, SelectionTypes.Remove); |
||||||
|
if (item != GetLastElement()) { |
||||||
|
if (item.ContentProperty != null) { |
||||||
|
if (item.ContentProperty.IsCollection) { |
||||||
|
if (item.ContentProperty.CollectionElements.Count != 0) { |
||||||
|
if (ModelTools.CanSelectComponent(item.ContentProperty.CollectionElements.First())) |
||||||
|
selection.SetSelectedComponents(new DesignItem[] {item.ContentProperty.CollectionElements.First()}, SelectionTypes.Primary); |
||||||
|
else |
||||||
|
SelectNextInPeers(item); |
||||||
|
} else |
||||||
|
SelectNextInPeers(item); |
||||||
|
} else if (item.ContentProperty.Value != null) { |
||||||
|
if (ModelTools.CanSelectComponent(item.ContentProperty.Value)) |
||||||
|
selection.SetSelectedComponents(new DesignItem[] {item.ContentProperty.Value}, SelectionTypes.Primary); |
||||||
|
else |
||||||
|
SelectNextInPeers(item); |
||||||
|
} else { |
||||||
|
SelectNextInPeers(item); |
||||||
|
} |
||||||
|
} else { |
||||||
|
SelectNextInPeers(item); |
||||||
|
} |
||||||
|
} else { |
||||||
|
//if the element was last element move focus to the root element to keep a focus cycle.
|
||||||
|
selection.SetSelectedComponents(new DesignItem[] {_context.RootItem}, SelectionTypes.Primary); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Moves focus up-the-tree.
|
||||||
|
/// </summary>
|
||||||
|
internal void MoveFocusBack() |
||||||
|
{ |
||||||
|
ISelectionService selection = _context.Services.Selection; |
||||||
|
DesignItem item = selection.PrimarySelection; |
||||||
|
if (item != _context.RootItem) { |
||||||
|
if (item.Parent != null && item.Parent.ContentProperty.IsCollection) { |
||||||
|
int index = item.Parent.ContentProperty.CollectionElements.IndexOf(item); |
||||||
|
if (index != 0) { |
||||||
|
if (ModelTools.CanSelectComponent(item.Parent.ContentProperty.CollectionElements.ElementAt(index - 1))) |
||||||
|
selection.SetSelectedComponents(new DesignItem[] {item.Parent.ContentProperty.CollectionElements.ElementAt(index - 1)}, SelectionTypes.Primary); |
||||||
|
} else { |
||||||
|
if (ModelTools.CanSelectComponent(item.Parent)) |
||||||
|
selection.SetSelectedComponents(new DesignItem[] {item.Parent}, SelectionTypes.Primary); |
||||||
|
} |
||||||
|
} else { |
||||||
|
if (ModelTools.CanSelectComponent(item.Parent)) |
||||||
|
selection.SetSelectedComponents(new DesignItem[] {item.Parent}, SelectionTypes.Primary); |
||||||
|
} |
||||||
|
} else { |
||||||
|
// if the element was root item move focus again to the last element.
|
||||||
|
selection.SetSelectedComponents(new DesignItem[] {GetLastElement()}, SelectionTypes.Primary); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the last element in the element hierarchy.
|
||||||
|
/// </summary>
|
||||||
|
private DesignItem GetLastElement() |
||||||
|
{ |
||||||
|
DesignItem item = _context.RootItem; |
||||||
|
while (item != null && item.ContentProperty != null) { |
||||||
|
if (item.ContentProperty.IsCollection) { |
||||||
|
if (item.ContentProperty.CollectionElements.Count != 0) { |
||||||
|
if (ModelTools.CanSelectComponent(item.ContentProperty.CollectionElements.Last())) |
||||||
|
item = item.ContentProperty.CollectionElements.Last(); |
||||||
|
else |
||||||
|
break; |
||||||
|
} else |
||||||
|
break; |
||||||
|
} else { |
||||||
|
if (item.ContentProperty.Value != null) |
||||||
|
item = item.ContentProperty.Value; |
||||||
|
else |
||||||
|
break; |
||||||
|
} |
||||||
|
} |
||||||
|
return item; |
||||||
|
} |
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Select the next element in the element collection if <paramref name="item"/> parent's had it's content property as collection.
|
||||||
|
/// </summary>
|
||||||
|
private void SelectNextInPeers(DesignItem item) |
||||||
|
{ |
||||||
|
ISelectionService selection = _context.Services.Selection; |
||||||
|
if (item.Parent != null && item.Parent.ContentProperty != null) { |
||||||
|
if (item.Parent.ContentProperty.IsCollection) { |
||||||
|
int index = item.Parent.ContentProperty.CollectionElements.IndexOf(item); |
||||||
|
if (index != item.Parent.ContentProperty.CollectionElements.Count) |
||||||
|
selection.SetSelectedComponents(new DesignItem[] {item.Parent.ContentProperty.CollectionElements.ElementAt(index + 1)}, SelectionTypes.Primary); |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue