ReFuel/Dashboard
ReFuel/Dashboard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: ReFuel:88e060a92bc36856d25d983f48ee1e73a17b9ada
Branches Tags
ReFuel:master
ReFuel:dashboard2
ReFuel:db-refactor-2024
ReFuel:blurg-test
...
compare: ReFuel:3b52649ad21019607d3fffb3a5d04b048ace869e
Branches Tags
ReFuel:dashboard2
ReFuel:db-refactor-2024
ReFuel:blurg-test
ReFuel:master

2 Commits
88e060a92b ... 3b52649ad2

Author SHA1 Message Date
H. Utku Maden
3b52649ad2 Change over to the new nuget package and change namespaces. 2024-06-24 22:28:41 +03:00
H. Utku Maden
f8a4c73367 Fix load order in FallbackFontDatabase. 2024-06-21 11:59:04 +03:00
6 changed files with 9 additions and 15 deletions
Show Stats Expand all files Collapse all files

2
Quik.Media.Defaults/FTProvider.cs
View File

@ -1,5 +1,5 @@
using System; using System;
using Quik.FreeType; using ReFuel.FreeType;
namespace Quik.Media.Defaults namespace Quik.Media.Defaults
{ {

14
Quik.Media.Defaults/Fallback/FallbackFontDatabase.cs
View File

@ -4,7 +4,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Text.Json.Serialization; using System.Text.Json.Serialization;
using System.Text.Json; using System.Text.Json;
using Quik.FreeType; using ReFuel.FreeType;
using Quik.Media.Font; using Quik.Media.Font;
using Quik.PAL; using Quik.PAL;
using Quik.Media.Defaults.Linux; using Quik.Media.Defaults.Linux;
@ -41,6 +41,8 @@ namespace Quik.Media.Defaults.Fallback
VerifyDatabase(database); VerifyDatabase(database);
FlushDatabase(database); FlushDatabase(database);
database.ForEach(x => AddFont(x.Face, new FileInfo(x.FilePath)));
(FontFace, FileInfo) serif = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.SerifFont, LinuxFonts.DefaultSerifFamilies, this); (FontFace, FileInfo) serif = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.SerifFont, LinuxFonts.DefaultSerifFamilies, this);
SystemFonts[SystemFontFamily.Serif] = serif.Item1; SystemFonts[SystemFontFamily.Serif] = serif.Item1;
(FontFace, FileInfo) sans = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.SansFont, LinuxFonts.DefaultSansFamilies, this); (FontFace, FileInfo) sans = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.SansFont, LinuxFonts.DefaultSansFamilies, this);
@ -51,14 +53,6 @@ namespace Quik.Media.Defaults.Fallback
SystemFonts[SystemFontFamily.Cursive] = cursive.Item1; SystemFonts[SystemFontFamily.Cursive] = cursive.Item1;
(FontFace, FileInfo) fantasy = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.FantasyFont, LinuxFonts.DefaultFantasyFamilies, this); (FontFace, FileInfo) fantasy = FontDataBaseProvider.ResolveSystemFont(EnvironmentVariables.FantasyFont, LinuxFonts.DefaultFantasyFamilies, this);
SystemFonts[SystemFontFamily.Fantasy] = fantasy.Item1; SystemFonts[SystemFontFamily.Fantasy] = fantasy.Item1;
AddFont(serif.Item1, serif.Item2);
AddFont(sans.Item1, sans.Item2);
AddFont(mono.Item1, mono.Item2);
AddFont(cursive.Item1, cursive.Item2);
AddFont(fantasy.Item1, fantasy.Item2);
database.ForEach(x => AddFont(x.Face, new FileInfo(x.FilePath)));
} }
public FileInfo FontFileInfo(FontFace face) public FileInfo FontFileInfo(FontFace face)
@ -241,7 +235,7 @@ namespace Quik.Media.Defaults.Fallback
{ {
FileInfo info = new FileInfo(DbPath); FileInfo info = new FileInfo(DbPath);
Directory.CreateDirectory(Path.GetDirectoryName(DbPath)); Directory.CreateDirectory(Path.GetDirectoryName(DbPath));
using Stream str = info.OpenWrite(); using Stream str = info.Open(FileMode.Create);
JsonSerializer.Serialize(str, db); JsonSerializer.Serialize(str, db);
} }

2
Quik.Media.Defaults/FontDatabaseProvider.cs
View File

@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using Quik.FreeType; using ReFuel.FreeType;
using Quik.Media.Defaults.Fallback; using Quik.Media.Defaults.Fallback;
using Quik.Media.Defaults.Linux; using Quik.Media.Defaults.Linux;
using Quik.Media.Font; using Quik.Media.Font;

2
Quik.Media.Defaults/Linux/FontConfigFontDatabase.cs
View File

@ -5,7 +5,7 @@ using System.Linq;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Runtime.InteropServices; using System.Runtime.InteropServices;
using System.Text; using System.Text;
using Quik.FreeType; using ReFuel.FreeType;
using Quik.Media.Font; using Quik.Media.Font;
using Quik.PAL; using Quik.PAL;

2
Quik.Media.Defaults/QFontFreeType.cs
View File

@ -1,7 +1,7 @@
using System; using System;
using System.Buffers; using System.Buffers;
using System.IO; using System.IO;
using Quik.FreeType; using ReFuel.FreeType;
using Quik.Media.Color; using Quik.Media.Color;
using Quik.Media.Font; using Quik.Media.Font;

2
Quik.Media.Defaults/Quik.Media.Defaults.csproj
View File

@ -8,7 +8,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Quik.FreeType" Version="1.1.0" /> <PackageReference Include="ReFuel.FreeType" Version="0.1.0-rc.3" />
<PackageReference Include="ReFuel.StbImage" Version="2.0.0-rc.3" /> <PackageReference Include="ReFuel.StbImage" Version="2.0.0-rc.3" />
</ItemGroup> </ItemGroup>