5E/AideDeJeu
1
0
Fork 0
mirror of https://github.com/Nioux/AideDeJeu.git synced 2025-10-31 15:36:07 +00:00
Code Issues Projects Releases Wiki Activity

Correctifs couleurs, police, barre de recherche sur nougat

Browse source
This commit is contained in:
Yan Maniez 2018-06-29 17:57:39 +02:00
parent 9cc8b2a5ee
commit 4cd979acee
4 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
AideDeJeu/AideDeJeu/Tools/Converters.cs
View file

@ -70,7 +70,7 @@ namespace AideDeJeu.Tools
var cstring = string.Empty; var cstring = string.Empty;
foreach (var str in strings) foreach (var str in strings)
{ {
cstring += str + "\n"; cstring += str + "\n\n";
} }
return cstring; return cstring;
// var fs = new FormattedString(); // var fs = new FormattedString();

4
AideDeJeu/AideDeJeu/Tools/MarkdownExtensions.cs
View file

@ -62,7 +62,7 @@ namespace AideDeJeu.Tools
if (block is Markdig.Syntax.ParagraphBlock) if (block is Markdig.Syntax.ParagraphBlock)
{ {
var paragraphBlock = block as Markdig.Syntax.ParagraphBlock; var paragraphBlock = block as Markdig.Syntax.ParagraphBlock;
spell.DescriptionHtml += MarkdownToHtml(paragraphBlock.ToMarkdownString()); spell.DescriptionHtml += MarkdownToHtml(paragraphBlock.ToMarkdownString()) + "\n";
////DumpParagraphBlock(paragraphBlock); ////DumpParagraphBlock(paragraphBlock);
//Console.WriteLine(paragraphBlock.IsBreakable); //Console.WriteLine(paragraphBlock.IsBreakable);
//spell.DescriptionHtml += paragraphBlock.Inline.ToContainerString(); //spell.DescriptionHtml += paragraphBlock.Inline.ToContainerString();
@ -178,7 +178,7 @@ namespace AideDeJeu.Tools
if (ininblock is Markdig.Syntax.ParagraphBlock) if (ininblock is Markdig.Syntax.ParagraphBlock)
{ {
var paragraphBlock = ininblock as Markdig.Syntax.ParagraphBlock; var paragraphBlock = ininblock as Markdig.Syntax.ParagraphBlock;
spell.DescriptionHtml += listBlock.BulletType + " " + MarkdownToHtml(paragraphBlock.ToMarkdownString()); spell.DescriptionHtml += listBlock.BulletType + " " + MarkdownToHtml(paragraphBlock.ToMarkdownString()) + "\n";
} }
} }
} }

3
AideDeJeu/AideDeJeu/Tools/MarkdownThemes.cs
View file

@ -12,10 +12,13 @@ namespace AideDeJeu.Tools
this.Margin = 0; this.Margin = 0;
var fd = FormatedTextHelpers.FontData.FromResource("content"); var fd = FormatedTextHelpers.FontData.FromResource("content");
//this.Paragraph.FontFamily = fd.FontFamily; //this.Paragraph.FontFamily = fd.FontFamily;
//this.Paragraph.FontFamily = "Droid Serif";
this.Paragraph.FontFamily = "serif";
this.Paragraph.FontSize = (float)fd.FontSize; this.Paragraph.FontSize = (float)fd.FontSize;
this.Paragraph.Attributes = fd.FontAttributes; this.Paragraph.Attributes = fd.FontAttributes;
this.Paragraph.ForegroundColor = fd.TextColor; this.Paragraph.ForegroundColor = fd.TextColor;
this.Paragraph.BackgroundColor = DefaultBackgroundColor;
this.BackgroundColor = DefaultBackgroundColor; this.BackgroundColor = DefaultBackgroundColor;
//this.Paragraph.ForegroundColor = DefaultTextColor; //this.Paragraph.ForegroundColor = DefaultTextColor;
this.Heading1.ForegroundColor = DefaultTextColor; this.Heading1.ForegroundColor = DefaultTextColor;

2
AideDeJeu/AideDeJeu/Views/MainPage.xaml
View file

@ -37,7 +37,7 @@
<ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" /> <ToolbarItem Name="About" Text="À propos de..." Order="Secondary" Icon="wooden_sign.png" Command="{Binding AboutCommand}" />
</ContentPage.ToolbarItems> </ContentPage.ToolbarItems>
<StackLayout Orientation="Vertical" VerticalOptions="Fill" HorizontalOptions="Fill"> <StackLayout Orientation="Vertical" VerticalOptions="Fill" HorizontalOptions="Fill">
<SearchBar x:Name="SearchBar" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}"> <SearchBar x:Name="SearchBar" HeightRequest="42" SearchCommand="{Binding SearchCommand}" SearchCommandParameter="{Binding Text, Source={x:Reference SearchBar}}">
<SearchBar.Behaviors> <SearchBar.Behaviors>
<tools:TextChangedBehavior /> <tools:TextChangedBehavior />
</SearchBar.Behaviors> </SearchBar.Behaviors>