fix fonts release

Signed-off-by: Sergey Isakov <isakov-sl@bk.ru>
This commit is contained in:
Sergey Isakov 2020-03-20 05:47:58 +03:00
parent 4d07a7376b
commit 3c9332b833
78 changed files with 15 additions and 85 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 43 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 53 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 49 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 111 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 257 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 120 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 260 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 490 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 328 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 472 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 KiB

View File

@ -1,71 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>Author</key>
<string>Slice</string>
<key>Description</key>
<string>Happy New Year</string>
<key>Theme</key>
<dict>
<key>Anime</key>
<array>
<dict>
<key>FrameTime</key>
<integer>200</integer>
<key>Frames</key>
<integer>27</integer>
<key>ID</key>
<integer>1</integer>
<key>Path</key>
<string>elka_1</string>
</dict>
</array>
<key>Background</key>
<dict>
<key>Path</key>
<string>snow.png</string>
<key>Type</key>
<string>Scale</string>
</dict>
<key>Badges</key>
<dict>
<key>Inline</key>
<false/>
<key>Show</key>
<false/>
<key>Swap</key>
<true/>
</dict>
<key>Banner</key>
<string>happy.png</string>
<key>Font</key>
<dict>
<key>CharWidth</key>
<integer>10</integer>
<key>Path</key>
<string>dark-wide.png</string>
<key>Type</key>
<string>Load</string>
</dict>
<key>Layout</key>
<dict>
<key>BannerOffset</key>
<integer>80</integer>
</dict>
<key>Selection</key>
<dict>
<key>Big</key>
<string>arrow-144.png</string>
<key>Color</key>
<string>0x1D7BEE80</string>
<key>OnTop</key>
<true/>
<key>Small</key>
<string>arrow-64.png</string>
</dict>
</dict>
<key>Year</key>
<string>2014</string>
</dict>
</plist>

View File

@ -4234,20 +4234,21 @@ InitTheme(
}
for (i = 0; i < 3; i++) {
// DBG("validate %d face\n", i);
DBG("validate %d face\n", i);
textFace[i].valid = FALSE;
}
// DBG("...done\n");
DBG("...done\n");
NSVGfontChain *fontChain = fontsDB;
while (fontChain) {
NSVGfont *font = fontChain->font;
DBG("free font %a\n", font->fontFamily);
NSVGfontChain *nextChain = fontChain->next;
if (font) {
nsvg__deleteFont(font);
fontChain->font = NULL;
}
FreePool(fontChain);
fontChain = nextChain->next;
fontChain = nextChain;
}
//as all font freed then free the chain
fontsDB = NULL;
@ -4262,7 +4263,7 @@ InitTheme(
row0TileSize = 144;
row1TileSize = 64;
if (FontImage != NULL) {
// DBG("free font image\n"); //raster font
DBG("free font image\n"); //raster font
egFreeImage (FontImage);
FontImage = NULL;
}
@ -4271,7 +4272,7 @@ InitTheme(
// Free selection images which are not builtin icons
for (i = 0; i < 6; i++) {
// DBG("free selection %d\n", i);
DBG("free selection %d\n", i);
if (SelectionImages[i] != NULL) {
if ((SelectionImages[i] != BuiltinIconTable[BUILTIN_SELECTION_SMALL].Image) &&
(SelectionImages[i] != BuiltinIconTable[BUILTIN_SELECTION_BIG].Image)) {
@ -4280,20 +4281,20 @@ InitTheme(
SelectionImages[i] = NULL;
}
}
// DBG("...done\n");
DBG("...done\n");
// Free banner which is not builtin icon
if (Banner != NULL) {
if (Banner != BuiltinIconTable[BUILTIN_ICON_BANNER].Image) {
// DBG("free banner\n");
DBG("free banner\n");
egFreeImage (Banner);
}
Banner = NULL;
}
// DBG("...done\n");
DBG("...done\n");
//Free buttons images
for (i = 0; i < 4; i++) {
if (Buttons[i] != NULL) {
// DBG("free button %d\n", i);
DBG("free button %d\n", i);
egFreeImage(Buttons[i]);
Buttons[i] = NULL;
}
@ -4304,22 +4305,22 @@ InitTheme(
//here we have no access to Mouse
// Invalidate BuiltinIcons
// DBG ("Invalidating BuiltinIcons...\n");
DBG ("Invalidating BuiltinIcons...\n");
for (i = 0; i < BUILTIN_ICON_COUNT; i++) {
if (BuiltinIconTable[i].Image != NULL) {
// DBG("free builtin image %d\n", i);
DBG("free builtin image %d\n", i);
egFreeImage (BuiltinIconTable[i].Image);
BuiltinIconTable[i].Image = NULL;
}
}
// DBG("...done\n");
DBG("...done\n");
while (GuiAnime != NULL) {
GUI_ANIME *NextAnime = GuiAnime->Next;
// DBG("free anime %d\n", GuiAnime->ID);
DBG("free anime %d\n", GuiAnime->ID);
FreeAnime (GuiAnime);
GuiAnime = NextAnime;
}
// DBG("...done\n");
DBG("...done\n");
GetThemeTagSettings(NULL);
if (ThemesNum > 0 &&