diff options
| author | Lluis Sanchez <lluis@xamarin.com> | 2013-12-04 00:20:01 +0400 |
|---|---|---|
| committer | Lluis Sanchez <lluis@xamarin.com> | 2013-12-04 00:20:01 +0400 |
| commit | 9cdd1b5aa38fa2b16f21953baec098cb6b3b2894 (patch) | |
| tree | fc987a783daee2f8a643bf6b6b8f88efd804ee97 /Xwt.WPF | |
| parent | 189e4ce8368fa3e8669d196fa40242f8d1f482af (diff) | |
| parent | 42a246b2954e11b0634897b5032d89101360ac94 (diff) | |
Merge remote-tracking branch 'origin/wpf-fixes'
Conflicts:
Xwt.WPF/Xwt.WPFBackend/BoxBackend.cs
Diffstat (limited to 'Xwt.WPF')
| -rw-r--r-- | Xwt.WPF/Xwt.WPFBackend/BoxBackend.cs | 5 | ||||
| -rw-r--r-- | Xwt.WPF/Xwt.WPFBackend/CustomScrollViewPort.cs | 16 |
2 files changed, 10 insertions, 11 deletions
diff --git a/Xwt.WPF/Xwt.WPFBackend/BoxBackend.cs b/Xwt.WPF/Xwt.WPFBackend/BoxBackend.cs index 4f9005c8..a31a3e1a 100644 --- a/Xwt.WPF/Xwt.WPFBackend/BoxBackend.cs +++ b/Xwt.WPF/Xwt.WPFBackend/BoxBackend.cs @@ -120,16 +120,15 @@ namespace Xwt.WPFBackend // because WPF widgets my cache some measurement information based on the
// constraints provided in the last Measure call (which when calculating the
// preferred size is normally set to infinite.
-
var r = rects[i].WithPositiveSize ();
if (force) {
// Don't recalculate the size unless a relayout is being forced
element.InvalidateMeasure ();
element.Measure (new SW.Size (r.Width, r.Height));
}
-
+
element.Arrange (r.ToWpfRect ());
- element.UpdateLayout ();
+ // element.UpdateLayout ();
}
}
}
diff --git a/Xwt.WPF/Xwt.WPFBackend/CustomScrollViewPort.cs b/Xwt.WPF/Xwt.WPFBackend/CustomScrollViewPort.cs index e9e32d23..6cae5772 100644 --- a/Xwt.WPF/Xwt.WPFBackend/CustomScrollViewPort.cs +++ b/Xwt.WPF/Xwt.WPFBackend/CustomScrollViewPort.cs @@ -152,22 +152,22 @@ namespace Xwt.WPFBackend public void MouseWheelDown() { - SetVerticalOffset (VerticalOffset + VerticalStepIncrement * 4); + SetVerticalOffset (VerticalOffset + 12); } public void MouseWheelLeft() { - SetHorizontalOffset (HorizontalOffset - HorizontalStepIncrement * 4); + SetHorizontalOffset (HorizontalOffset - 12); } public void MouseWheelRight() { - SetHorizontalOffset (HorizontalOffset + HorizontalStepIncrement * 4); + SetHorizontalOffset (HorizontalOffset + 12); } public void MouseWheelUp() { - SetVerticalOffset (VerticalOffset - VerticalStepIncrement * 4); + SetVerticalOffset (VerticalOffset - 12); } public void PageDown() @@ -284,22 +284,22 @@ namespace Xwt.WPFBackend protected double VerticalPageIncrement { - get { return (this.verticalBackend != null) ? this.verticalBackend.PageIncrement : 10; } + get { return (this.verticalBackend != null) ? this.verticalBackend.PageIncrement : ViewportHeight; } } protected double HorizontalPageIncrement { - get { return (this.horizontalBackend != null) ? this.horizontalBackend.PageIncrement : 10; } + get { return (this.horizontalBackend != null) ? this.horizontalBackend.PageIncrement : ViewportWidth; } } protected double VerticalStepIncrement { - get { return (this.verticalBackend != null) ? this.verticalBackend.StepIncrement : 1; } + get { return (this.verticalBackend != null) ? this.verticalBackend.StepIncrement : VerticalPageIncrement / 10; } } protected double HorizontalStepIncrement { - get { return (this.horizontalBackend != null) ? this.horizontalBackend.StepIncrement : 1; } + get { return (this.horizontalBackend != null) ? this.horizontalBackend.StepIncrement : HorizontalPageIncrement / 10; } } protected override WSize MeasureOverride (WSize constraint) |