diff options
| author | Mike Krüger <mkrueger@xamarin.com> | 2013-08-20 11:10:11 +0400 |
|---|---|---|
| committer | Mike Krüger <mkrueger@xamarin.com> | 2013-08-20 11:10:11 +0400 |
| commit | 1da11d85a4335446ab9f0d7eefe6df378192d486 (patch) | |
| tree | 7ed129f04319507bf0d1d728d0f7a1d5d35469d7 /main/src | |
| parent | 426323934d1d1cc937c8a94eec5f4276cf2504d9 (diff) | |
Fixed 'Bug 14078 - HexEditor tries to get negative byte ranges when
editor data is too short to fill a page'.
Diffstat (limited to 'main/src')
| -rw-r--r-- | main/src/addins/MonoDevelop.HexEditor/Mono.MHex.Rendering/GutterMargin.cs | 2 | ||||
| -rw-r--r-- | main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs | 15 |
2 files changed, 4 insertions, 13 deletions
diff --git a/main/src/addins/MonoDevelop.HexEditor/Mono.MHex.Rendering/GutterMargin.cs b/main/src/addins/MonoDevelop.HexEditor/Mono.MHex.Rendering/GutterMargin.cs index 12475739be..d83dcc0894 100644 --- a/main/src/addins/MonoDevelop.HexEditor/Mono.MHex.Rendering/GutterMargin.cs +++ b/main/src/addins/MonoDevelop.HexEditor/Mono.MHex.Rendering/GutterMargin.cs @@ -72,7 +72,7 @@ namespace Mono.MHex.Rendering ctx.SetColor (Style.HexOffsetBg); ctx.Fill (); - if (line * Editor.BytesInRow < Data.Length) { + if (line >= 0 && line * Editor.BytesInRow < Data.Length) { LayoutWrapper layout = GetLayout (line); var sz = layout.Layout.GetSize (); ctx.SetColor (line != Caret.Line ? Style.HexOffset : Style.HexOffsetHighlighted); diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs index 29c3678c86..1fdf19d4b2 100644 --- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs +++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs @@ -104,20 +104,11 @@ namespace MonoDevelop.HexEditor hexEditor.HexEditorData.Buffer = new ArrayBuffer (buf); hexEditor.Sensitive = CanEdit (val); - var scrolled = new ScrolledWindow () { - HscrollbarPolicy = PolicyType.Automatic, - VscrollbarPolicy = PolicyType.Automatic, - ShadowType = ShadowType.In - }; - - var hexEditorWidget = (Widget) Xwt.Toolkit.CurrentEngine.GetNativeWidget (hexEditor); - scrolled.AddWithViewport (hexEditorWidget); - scrolled.ShowAll (); - + var xwtScrollView = new Xwt.ScrollView (hexEditor); + var scrollWidget = (Widget) Xwt.Toolkit.CurrentEngine.GetNativeWidget (xwtScrollView); SetHexEditorOptions (); hexEditor.SetFocus (); - - return scrolled; + return scrollWidget; } public bool StoreValue (ObjectValue val) |