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

Re-enable TreeView horizontal scroll.

pull/58/head
Steven Kirk 11 years ago
parent
566e66d848
commit
afb0ce4a87
2 changed files with 5 additions and 8 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 12
      Perspex.Themes.Default/ScrollViewerStyle.cs
  2. 1
      Perspex.Themes.Default/TreeViewStyle.cs

12
Perspex.Themes.Default/ScrollViewerStyle.cs
View File

@ -31,8 +31,6 @@ namespace Perspex.Themes.Default
private Control Template(ScrollViewer control) private Control Template(ScrollViewer control)
{ {
ScrollBar vert;
var result = new Grid var result = new Grid
{ {
ColumnDefinitions = new ColumnDefinitions ColumnDefinitions = new ColumnDefinitions
@ -61,26 +59,24 @@ namespace Perspex.Themes.Default
Id = "horizontalScrollBar", Id = "horizontalScrollBar",
Orientation = Orientation.Horizontal, Orientation = Orientation.Horizontal,
[~ScrollBar.MaximumProperty] = control[~ScrollViewer.HorizontalScrollBarMaximumProperty], [~ScrollBar.MaximumProperty] = control[~ScrollViewer.HorizontalScrollBarMaximumProperty],
//[~~ScrollBar.ValueProperty] = control[~~ScrollViewer.HorizontalScrollBarValueProperty], [~~ScrollBar.ValueProperty] = control[~~ScrollViewer.HorizontalScrollBarValueProperty],
[~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.HorizontalScrollBarViewportSizeProperty], [~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.HorizontalScrollBarViewportSizeProperty],
[~ScrollBar.VisibilityProperty] = control[~ScrollViewer.HorizontalScrollBarVisibilityProperty], [~ScrollBar.VisibilityProperty] = control[~ScrollViewer.HorizontalScrollBarVisibilityProperty],
[Grid.RowProperty] = 1, [Grid.RowProperty] = 1,
}, },
(vert = new ScrollBar new ScrollBar
{ {
Id = "verticalScrollBar", Id = "verticalScrollBar",
Orientation = Orientation.Vertical, Orientation = Orientation.Vertical,
[~ScrollBar.MaximumProperty] = control[~ScrollViewer.VerticalScrollBarMaximumProperty], [~ScrollBar.MaximumProperty] = control[~ScrollViewer.VerticalScrollBarMaximumProperty],
//[~~ScrollBar.ValueProperty] = control[~~ScrollViewer.VerticalScrollBarValueProperty], [~~ScrollBar.ValueProperty] = control[~~ScrollViewer.VerticalScrollBarValueProperty],
[~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.VerticalScrollBarViewportSizeProperty], [~ScrollBar.ViewportSizeProperty] = control[~ScrollViewer.VerticalScrollBarViewportSizeProperty],
[~ScrollBar.VisibilityProperty] = control[~ScrollViewer.VerticalScrollBarVisibilityProperty], [~ScrollBar.VisibilityProperty] = control[~ScrollViewer.VerticalScrollBarVisibilityProperty],
[Grid.ColumnProperty] = 1, [Grid.ColumnProperty] = 1,
}), },
}, },
}; };
vert[~~ScrollBar.ValueProperty] = control[~~ScrollViewer.VerticalScrollBarValueProperty];
return result; return result;
} }
} }

1
Perspex.Themes.Default/TreeViewStyle.cs
View File

@ -40,6 +40,7 @@ namespace Perspex.Themes.Default
[~Border.BorderThicknessProperty] = control[~TreeView.BorderThicknessProperty], [~Border.BorderThicknessProperty] = control[~TreeView.BorderThicknessProperty],
Content = new ScrollViewer Content = new ScrollViewer
{ {
CanScrollHorizontally = true,
Content = new ItemsPresenter Content = new ItemsPresenter
{ {
Id = "itemsPresenter", Id = "itemsPresenter",

Write Preview
Loading…
Cancel
Save