Skip to content
This repository was archived by the owner on Sep 3, 2019. It is now read-only.

No need to remove the control before SetLayout #221

Open
rodionsh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

No need to remove the control before SetLayout #221

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions OsmSharp.Android.UI/Controls/MapControl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,27 +327,33 @@ internal override bool SetLayout(double pixelsWidth, double pixelsHeight, View2D
{ // keep location the same and move with map.
if (this.Location != null)
{ // only set layout if there is a location set.
var layoutParams = this.View.LayoutParameters as FrameLayout.LayoutParams;
var projected = projection.ToPixel(this.Location);
double leftMargin, topMargin;
var fromMatrix = view.CreateToViewPort(pixelsWidth, pixelsHeight);
fromMatrix.Apply(projected[0], projected[1], out leftMargin, out topMargin);

leftMargin = leftMargin - (this.View.LayoutParameters as FrameLayout.LayoutParams).Width / 2.0;
//leftMargin = leftMargin - (this.View.LayoutParameters as FrameLayout.LayoutParams).Width / 2.0;
leftMargin = leftMargin - layoutParams.Width/2;

switch (_alignment)
{
case MapControlAlignmentType.Center:
topMargin = topMargin - (this.View.LayoutParameters as FrameLayout.LayoutParams).Height / 2.0;
//topMargin = topMargin - (this.View.LayoutParameters as FrameLayout.LayoutParams).Height / 2.0;
topMargin = topMargin - layoutParams.Height/2;
break;
case MapControlAlignmentType.CenterTop:
break;
case MapControlAlignmentType.CenterBottom:
topMargin = topMargin - (this.View.LayoutParameters as FrameLayout.LayoutParams).Height;
//topMargin = topMargin - (this.View.LayoutParameters as FrameLayout.LayoutParams).Height;
topMargin = topMargin - layoutParams.Height;
break;
}

(this.View.LayoutParameters as FrameLayout.LayoutParams).LeftMargin = (int)leftMargin;
(this.View.LayoutParameters as FrameLayout.LayoutParams).TopMargin = (int)topMargin;
layoutParams.LeftMargin = (int)leftMargin;
layoutParams.TopMargin = (int)topMargin;
//(this.View.LayoutParameters as FrameLayout.LayoutParams).LeftMargin = (int)leftMargin;
//(this.View.LayoutParameters as FrameLayout.LayoutParams).TopMargin = (int)topMargin;
this.View.LayoutParameters = layoutParams;
}
}
else
Expand Down Expand Up @@ -384,4 +390,4 @@ public override void Dispose()

}
}
}
}