amacocian/MonoGame.Extended
1
0
Fork 0
mirror of https://github.com/AlexMacocian/MonoGame.Extended.git synced 2026-07-25 08:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some clipping rectangle issues

Browse Source
This commit is contained in:
Dylan Wilson
2018-03-28 22:56:18 +10:00
parent 95e1ab0881
commit f523efabe4
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/MonoGame.Extended.Gui/Controls/ComboBox.cs
+1 -1
View File
@@ -80,7 +80,7 @@ namespace MonoGame.Extended.Gui.Controls
DrawItemList(context, renderer);
}
var selectedTextInfo = GetItemTextInfo(context, ContentRectangle, SelectedItem, ClippingRectangle);
var selectedTextInfo = GetItemTextInfo(context, ContentRectangle, SelectedItem);
if (!string.IsNullOrWhiteSpace(selectedTextInfo.Text))
renderer.DrawText(selectedTextInfo.Font, selectedTextInfo.Text, selectedTextInfo.Position + TextOffset, selectedTextInfo.Color, selectedTextInfo.ClippingRectangle);
Source/MonoGame.Extended.Gui/Controls/Control.cs
+2 -2
View File
@@ -221,13 +221,13 @@ namespace MonoGame.Extended.Gui.Controls
return Parent != null && (Parent == control || Parent.HasParent(control));
}
protected TextInfo GetTextInfo(IGuiContext context, string text, Rectangle targetRectangle, HorizontalAlignment horizontalAlignment, VerticalAlignment verticalAlignment, Rectangle? clippingRectangle = null)
protected TextInfo GetTextInfo(IGuiContext context, string text, Rectangle targetRectangle, HorizontalAlignment horizontalAlignment, VerticalAlignment verticalAlignment)
{
var font = Font ?? context.DefaultFont;
var textSize = (Size)font.GetStringRectangle(text ?? string.Empty, Vector2.Zero).Size;
var destinationRectangle = LayoutHelper.AlignRectangle(horizontalAlignment, verticalAlignment, textSize, targetRectangle);
var textPosition = destinationRectangle.Location.ToVector2();
var textInfo = new TextInfo(text, font, textPosition, textSize, TextColor, clippingRectangle);// ?? ClippingRectangle);
var textInfo = new TextInfo(text, font, textPosition, textSize, TextColor, targetRectangle);
return textInfo;
}
Source/MonoGame.Extended.Gui/Controls/SelectorControl.cs
+3 -3
View File
@@ -95,11 +95,11 @@ namespace MonoGame.Extended.Gui.Controls
protected virtual void OnItemClicked(IGuiContext context, PointerEventArgs args) { }
protected TextInfo GetItemTextInfo(IGuiContext context, Rectangle itemRectangle, object item, Rectangle? clippingRectangle)
protected TextInfo GetItemTextInfo(IGuiContext context, Rectangle itemRectangle, object item)
{
var textRectangle = new Rectangle(itemRectangle.X + ItemPadding.Left, itemRectangle.Y + ItemPadding.Top,
itemRectangle.Width - ItemPadding.Right, itemRectangle.Height - ItemPadding.Bottom);
var itemTextInfo = GetTextInfo(context, GetItemName(item), textRectangle, HorizontalTextAlignment, VerticalTextAlignment, clippingRectangle);
var itemTextInfo = GetTextInfo(context, GetItemName(item), textRectangle, HorizontalTextAlignment, VerticalTextAlignment);
return itemTextInfo;
}
@@ -160,7 +160,7 @@ namespace MonoGame.Extended.Gui.Controls
{
var item = Items[i];
var itemRectangle = GetItemRectangle(context, i - FirstIndex, listRectangle);
var itemTextInfo = GetItemTextInfo(context, itemRectangle, item, listRectangle);
var itemTextInfo = GetItemTextInfo(context, itemRectangle, item);
var textColor = i == SelectedIndex ? SelectedTextColor : itemTextInfo.Color;
if (SelectedIndex == i)
Source/MonoGame.Extended.Gui/Controls/TextBox.cs
+2 -1
View File
@@ -47,7 +47,8 @@ namespace MonoGame.Extended.Gui.Controls
public override Size GetContentSize(IGuiContext context)
{
var font = Font ?? context.DefaultFont;
return (Size)font.MeasureString(Text ?? string.Empty);
var stringSize = (Size)font.MeasureString(Text ?? string.Empty);
return new Size(stringSize.Width, stringSize.Height < font.LineHeight ? font.LineHeight : stringSize.Height);
}
//protected override Size2 CalculateDesiredSize(IGuiContext context, Size2 availableSize)