diff options
| author | Alan McGovern <alan.mcgovern@gmail.com> | 2012-03-30 15:18:55 +0400 |
|---|---|---|
| committer | Alan McGovern <alan.mcgovern@gmail.com> | 2012-03-30 15:18:55 +0400 |
| commit | 910868b3b79c521cdf872cd921ae771c5f484fe6 (patch) | |
| tree | ecc7c31cf3deddfb09e4527160d66e5a80428947 /main/src/addins/VersionControl | |
| parent | 983c0dcd9092afa252e80363037b9414432de3dc (diff) | |
| parent | ae5da81350720c290b7067687a3f01e73040c485 (diff) | |
Merge branch 'master' into newresolver
Diffstat (limited to 'main/src/addins/VersionControl')
2 files changed, 4 insertions, 3 deletions
diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs index 5a515367bb..4bf717a5c4 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/BlameWidget.cs @@ -228,7 +228,7 @@ namespace MonoDevelop.VersionControl.Views editor.SizeAllocate (new Rectangle (childRectangle.X, childRectangle.Top, childRectangle.Width - overviewWidth, childRectangle.Height)); if (hScrollBar.Visible) { - hScrollBar.SizeAllocate (new Rectangle (childRectangle.X, childRectangle.Bottom, childRectangle.Width, hheight)); + hScrollBar.SizeAllocate (new Rectangle (childRectangle.X, childRectangle.Y + childRectangle.Height, childRectangle.Width, hheight)); hScrollBar.Value = System.Math.Max (System.Math.Min (hAdjustment.Upper - hAdjustment.PageSize, hScrollBar.Value), hAdjustment.Lower); } } diff --git a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs index 3123722e8e..4358f82a56 100644 --- a/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs +++ b/main/src/addins/VersionControl/MonoDevelop.VersionControl/MonoDevelop.VersionControl.Views/EditorCompareWidgetBase.cs @@ -473,8 +473,9 @@ namespace MonoDevelop.VersionControl.Views Rectangle editorRectangle = new Rectangle (childRectangle.X + (editorWidth + middleAreaWidth) * i , childRectangle.Top, editorWidth, childRectangle.Height); editors[i].SizeAllocate (editorRectangle); - if (hScrollBarVisible) - hScrollBars[i].SizeAllocate (new Rectangle (editorRectangle.X, editorRectangle.Bottom, editorRectangle.Width, hheight)); + if (hScrollBarVisible) { + hScrollBars[i].SizeAllocate (new Rectangle (editorRectangle.X, editorRectangle.Y + editorRectangle.Height, editorRectangle.Width, hheight)); + } if (headerWidgets != null) headerWidgets[i].SizeAllocate (new Rectangle (editorRectangle.X, allocation.Y + 1, editorRectangle.Width, headerSize)); |