mirror of
https://github.com/Ellpeck/MLEM.git
synced 2024-11-25 05:58:35 +01:00
Compare commits
No commits in common. "68fc02b1708a6cb8d643b6fd5702d38905846260" and "b46975391b65083313c50fb066bf2192101bcd7f" have entirely different histories.
68fc02b170
...
b46975391b
2 changed files with 2 additions and 8 deletions
|
@ -25,9 +25,6 @@ Improvements
|
||||||
- Allow for checkboxes and radio buttons to be disabled
|
- Allow for checkboxes and radio buttons to be disabled
|
||||||
- Only set a paragraph's area dirty when a text change would cause it to change size
|
- Only set a paragraph's area dirty when a text change would cause it to change size
|
||||||
|
|
||||||
Fixes
|
|
||||||
- Fixed paragraph links having incorrect hover locations when using special text alignments
|
|
||||||
|
|
||||||
### MLEM.Data
|
### MLEM.Data
|
||||||
Improvements
|
Improvements
|
||||||
- Rethrow exceptions when no RawContentManager readers could be constructed
|
- Rethrow exceptions when no RawContentManager readers could be constructed
|
||||||
|
|
|
@ -192,7 +192,7 @@ namespace MLEM.Ui.Elements {
|
||||||
protected void SetTextDirty() {
|
protected void SetTextDirty() {
|
||||||
this.TokenizedText = null;
|
this.TokenizedText = null;
|
||||||
// only set our area dirty if our size changed as a result of this action or if we have link children we need to update
|
// only set our area dirty if our size changed as a result of this action or if we have link children we need to update
|
||||||
if (!this.AreaDirty && (!this.CalcActualSize(this.ParentArea).Equals(this.DisplayArea.Size, Epsilon) || this.Children.Count > 0))
|
if (!this.AreaDirty && (this.Children.Count > 0 || !this.CalcActualSize(this.ParentArea).Equals(this.DisplayArea.Size, Epsilon)))
|
||||||
this.SetAreaDirty();
|
this.SetAreaDirty();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -266,10 +266,7 @@ namespace MLEM.Ui.Elements {
|
||||||
if (ret != null)
|
if (ret != null)
|
||||||
return ret;
|
return ret;
|
||||||
// check if any of our token's parts are hovered
|
// check if any of our token's parts are hovered
|
||||||
var location = this.Parent.DisplayArea.Location;
|
foreach (var rect in this.Token.GetArea(this.Parent.DisplayArea.Location, this.Scale * this.textScale)) {
|
||||||
if (this.Parent is Paragraph p)
|
|
||||||
location.X += p.GetAlignmentOffset();
|
|
||||||
foreach (var rect in this.Token.GetArea(location, this.Scale * this.textScale)) {
|
|
||||||
if (rect.Contains(this.TransformInverse(position)))
|
if (rect.Contains(this.TransformInverse(position)))
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue