Skip to content

Features/many optimizations #306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Features/many optimizations #306

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1bb35de
Text can now be localized for a specific project in a xmmp file
LHarskampAuxil Feb 19, 2021
32338e3
Expanded LocalizationTexts
LuckyScamper Feb 19, 2021
a852ab5
localization uses the key as fallback if the Localize func isn't set.
LuckyScamper Feb 20, 2021
cb3b3df
Added simple markup diagnostics
TechPizzaDev Feb 20, 2021
41a4146
Merge pull request #1 from LuckyScamper/feature/xmmp_events
LuckyScamper Feb 20, 2021
e3e4174
Merge branch 'master' of https://github.com/TechnologicalPizza/Myra i…
LuckyScamper Feb 20, 2021
45c723a
Merge branch 'TechnologicalPizza-master'
LuckyScamper Feb 20, 2021
23974b2
merging two repositories
LuckyScamper Feb 20, 2021
2c9f608
multiple bugfixes and stack error changes
LuckyScamper Feb 21, 2021
6bcd1d8
Prevented unnessary exception TextureRegionAtlas: why throw an except…
LuckyScamper Feb 21, 2021
837b234
diagnostics are now entered in project constructor
LuckyScamper Feb 25, 2021
9434676
Merge commit
LuckyScamper Feb 25, 2021
2e2c4c5
ColorHSV now uses proper equals function
LuckyScamper Feb 25, 2021
4cbd9f0
new versioning
LuckyScamper Mar 4, 2021
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
13 changes: 1 addition & 12 deletions src/Myra/Graphics2D/TextureAtlases/TextureRegionAtlas.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,18 +103,7 @@ public string ToXml()
/// <returns></returns>
public static TextureRegionAtlas Load(string data, Func<string, Texture2D> textureGetter)
{
bool isXml;
try
{
var xDoc = XDocument.Parse(data);
isXml = true;
}
catch (Exception)
{
isXml = false;
}

if (isXml)
if (data.StartsWith("<") && data.EndsWith(">"))
{
return FromXml(data, textureGetter);
}
Expand Down
5 changes: 4 additions & 1 deletion src/Myra/Graphics2D/UI/ComboBox.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,10 @@ internal void UpdateSelectedItem()
{
InternalChild.Text = item.Text;
InternalChild.TextColor = item.Color ?? _listBox.ListBoxStyle.ListItemStyle.LabelStyle.TextColor;
((ImageTextButton)item.Widget).IsPressed = true;
if (item.Widget != null)
{
((ImageTextButton)item.Widget).IsPressed = true;
}
}
else
{
Expand Down
15 changes: 15 additions & 0 deletions src/Myra/Graphics2D/UI/ImageTextButton.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,21 @@ public enum TextPositionEnum
private readonly Label _label;
private TextPositionEnum _textPosition;


private string _l18nText;
public string L18nTextKey
{
get
{
return _l18nText;
}
set
{
_l18nText = value;
Text = Project.Localize?.Invoke(value) ?? value;
}
}

[Category("Appearance")]
[DefaultValue(null)]
public string Text
Expand Down
14 changes: 14 additions & 0 deletions src/Myra/Graphics2D/UI/Label.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,20 @@ public int VerticalSpacing
}
}

private string _l18nText;
public string L18nTextKey
{
get
{
return _l18nText;
}
set
{
_l18nText = value;
Text = Project.Localize?.Invoke(value) ?? value;
}
}

[Category("Appearance")]
[DefaultValue(null)]
public string Text
Expand Down
Loading