diff options
| author | George Hazan <ghazan@miranda.im> | 2018-07-25 23:10:36 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-07-25 23:10:36 +0300 |
| commit | a411a7391bb879db8da398f067245a13c7fa7aee (patch) | |
| tree | 4b2c76ca8bc0b43b1084b8234746810c3ef6c446 /plugins/YAPP/src/yapp.cpp | |
| parent | 942c498d6e8901f751b088c0adfcb8f3fc67576c (diff) | |
major code cleaning of all font-related structures
Diffstat (limited to 'plugins/YAPP/src/yapp.cpp')
| -rw-r--r-- | plugins/YAPP/src/yapp.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/plugins/YAPP/src/yapp.cpp b/plugins/YAPP/src/yapp.cpp index 041ef7d85a..f3642de98c 100644 --- a/plugins/YAPP/src/yapp.cpp +++ b/plugins/YAPP/src/yapp.cpp @@ -11,8 +11,8 @@ MNOTIFYLINK *notifyLink = nullptr; // used to work around a bug in neweventnotify and others with the address passed in the GetPluginData function
bool ignore_gpd_passed_addy = false;
-FontIDW font_id_firstline = {0}, font_id_secondline = {0}, font_id_time = {0};
-ColourIDW colour_id_bg = {0}, colour_id_border = {0}, colour_id_sidebar = {0}, colour_id_titleunderline = {0};
+FontIDW font_id_firstline = {}, font_id_secondline = {}, font_id_time = {};
+ColourIDW colour_id_bg = {}, colour_id_border = {}, colour_id_sidebar = {}, colour_id_titleunderline = {};
COLORREF colBg = GetSysColor(COLOR_3DSHADOW);
HFONT hFontFirstLine = nullptr, hFontSecondLine = nullptr, hFontTime = nullptr;
@@ -86,40 +86,36 @@ static int TTBLoaded(WPARAM, LPARAM) static void InitFonts()
{
- font_id_firstline.cbSize = sizeof(FontIDW);
font_id_firstline.flags = FIDF_ALLOWEFFECTS;
mir_wstrcpy(font_id_firstline.group, LPGENW("Popups"));
mir_wstrcpy(font_id_firstline.name, LPGENW("First line"));
mir_strcpy(font_id_firstline.dbSettingsGroup, MODULENAME);
- mir_strcpy(font_id_firstline.prefix, "FontFirst");
+ mir_strcpy(font_id_firstline.setting, "FontFirst");
mir_wstrcpy(font_id_firstline.backgroundGroup, L"Popups");
mir_wstrcpy(font_id_firstline.backgroundName, L"Background");
font_id_firstline.order = 0;
g_plugin.addFont(&font_id_firstline);
- font_id_secondline.cbSize = sizeof(FontIDW);
font_id_secondline.flags = FIDF_ALLOWEFFECTS;
mir_wstrcpy(font_id_secondline.group, LPGENW("Popups"));
mir_wstrcpy(font_id_secondline.name, LPGENW("Second line"));
mir_strcpy(font_id_secondline.dbSettingsGroup, MODULENAME);
- mir_strcpy(font_id_secondline.prefix, "FontSecond");
+ mir_strcpy(font_id_secondline.setting, "FontSecond");
mir_wstrcpy(font_id_secondline.backgroundGroup, L"Popups");
mir_wstrcpy(font_id_secondline.backgroundName, L"Background");
font_id_secondline.order = 1;
g_plugin.addFont(&font_id_secondline);
- font_id_time.cbSize = sizeof(FontIDW);
font_id_time.flags = FIDF_ALLOWEFFECTS;
mir_wstrcpy(font_id_time.group, LPGENW("Popups"));
mir_wstrcpy(font_id_time.name, LPGENW("Time"));
mir_strcpy(font_id_time.dbSettingsGroup, MODULENAME);
- mir_strcpy(font_id_time.prefix, "FontTime");
+ mir_strcpy(font_id_time.setting, "FontTime");
mir_wstrcpy(font_id_time.backgroundGroup, L"Popups");
mir_wstrcpy(font_id_time.backgroundName, L"Background");
font_id_time.order = 2;
g_plugin.addFont(&font_id_time);
- colour_id_bg.cbSize = sizeof(ColourIDW);
mir_wstrcpy(colour_id_bg.group, LPGENW("Popups"));
mir_wstrcpy(colour_id_bg.name, LPGENW("Background"));
mir_strcpy(colour_id_bg.dbSettingsGroup, MODULENAME);
@@ -128,7 +124,6 @@ static void InitFonts() colour_id_bg.order = 0;
g_plugin.addColor(&colour_id_bg);
- colour_id_border.cbSize = sizeof(ColourIDW);
mir_wstrcpy(colour_id_border.group, LPGENW("Popups"));
mir_wstrcpy(colour_id_border.name, LPGENW("Border"));
mir_strcpy(colour_id_border.dbSettingsGroup, MODULENAME);
@@ -137,7 +132,6 @@ static void InitFonts() colour_id_border.order = 1;
g_plugin.addColor(&colour_id_border);
- colour_id_sidebar.cbSize = sizeof(ColourIDW);
mir_wstrcpy(colour_id_sidebar.group, LPGENW("Popups"));
mir_wstrcpy(colour_id_sidebar.name, LPGENW("Sidebar"));
mir_strcpy(colour_id_sidebar.dbSettingsGroup, MODULENAME);
@@ -146,7 +140,6 @@ static void InitFonts() colour_id_sidebar.order = 2;
g_plugin.addColor(&colour_id_sidebar);
- colour_id_titleunderline.cbSize = sizeof(ColourIDW);
mir_wstrcpy(colour_id_titleunderline.group, LPGENW("Popups"));
mir_wstrcpy(colour_id_titleunderline.name, LPGENW("Title underline"));
mir_strcpy(colour_id_titleunderline.dbSettingsGroup, MODULENAME);
|