Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/xwt.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan McGovern <alan@xamarin.com>2018-06-14 19:44:53 +0300
committerAlan McGovern <alan@xamarin.com>2018-06-14 19:44:57 +0300
commit6d91a7440c78ba794fa8446036a4b72d36bcfb2d (patch)
tree34b9d83c39ef42c09e98e29e270edbc9b174bfb3
parent5a3ab51b93e38cbe520915afce00d2599cab3812 (diff)
Revert "[Wpf] Don't skip the Measure step all the time"d15-7
This reverts commit facedf57cf4e2cce7f59d98f4b29042999b9821d. This was reverted in master and d15-8, so we shoudl revert it here to avoid accidentally shipping it again.
-rw-r--r--Xwt.WPF/Xwt.WPFBackend/BoxBackend.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/Xwt.WPF/Xwt.WPFBackend/BoxBackend.cs b/Xwt.WPF/Xwt.WPFBackend/BoxBackend.cs
index 6e198974..dbbb69af 100644
--- a/Xwt.WPF/Xwt.WPFBackend/BoxBackend.cs
+++ b/Xwt.WPF/Xwt.WPFBackend/BoxBackend.cs
@@ -129,8 +129,9 @@ namespace Xwt.WPFBackend
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.Measure (new SW.Size (r.Width, r.Height));
+
element.Arrange (r.ToWpfRect ());
// element.UpdateLayout ();
}