diff options
| -rw-r--r-- | src/modules/fonts/FontOptions.cpp | 29 | ||||
| -rw-r--r-- | src/modules/fonts/services.cpp | 8 |
2 files changed, 24 insertions, 13 deletions
diff --git a/src/modules/fonts/FontOptions.cpp b/src/modules/fonts/FontOptions.cpp index f95b590912..46cf322731 100644 --- a/src/modules/fonts/FontOptions.cpp +++ b/src/modules/fonts/FontOptions.cpp @@ -32,7 +32,7 @@ static int sttCompareFont(const FontInternal* p1, const FontInternal* p2) int result = _tcscmp(p1->group, p2->group);
if (result != 0)
return result;
-
+
result = p1->order - p2->order;
if (result != 0)
return result;
@@ -294,7 +294,9 @@ static BOOL sttFsuiBindColourIdToFonts(HWND hwndList, const TCHAR *name, const T if (backgroundGroup && backgroundName && !_tcscmp(F.backgroundGroup, backgroundGroup) && !_tcscmp(F.backgroundName, backgroundName)) {
itemData->colour_id = colourId;
res = TRUE;
- } } }
+ }
+ }
+ }
return res;
}
@@ -387,7 +389,8 @@ static void sttFsuiCreateSettingsTreeNode(HWND hwndTree, const TCHAR *groupName, tvis.item.mask = TVIF_HANDLE|TVIF_STATE;
tvis.item.state = tvis.item.stateMask = db_get_b(NULL, "FontServiceUI", treeItem->paramName, TVIS_EXPANDED);
TreeView_SetItem(hwndTree, &tvis.item);
- } }
+ }
+ }
if (sectionName) {
*sectionName = '/';
@@ -430,10 +433,12 @@ static void sttSaveCollapseState(HWND hwndTree) hti = TreeView_GetParent(hwndTree, hti);
if (hti == NULL) break;
ht = TreeView_GetNextSibling(hwndTree, hti);
- } }
+ }
+ }
hti = ht;
-} }
+ }
+}
static void sttFreeListItems(HWND hList)
{
@@ -480,7 +485,9 @@ static INT_PTR CALLBACK ChooseEffectDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wPar if (SendDlgItemMessage(hwndDlg, IDC_EFFECT_COMBO, CB_GETITEMDATA, i, 0) == pEffect->effectIndex) {
SendDlgItemMessage(hwndDlg, IDC_EFFECT_COMBO, CB_SETCURSEL, i, 0);
break;
- } } }
+ }
+ }
+ }
SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR1, CPM_SETCOLOUR, 0, pEffect->baseColour&0x00FFFFFF);
SendDlgItemMessage(hwndDlg, IDC_EFFECT_COLOUR2, CPM_SETCOLOUR, 0, pEffect->secondaryColour&0x00FFFFFF);
@@ -652,7 +659,8 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, itemId = SendDlgItemMessage(hwndDlg, IDC_FONTLIST, LB_ADDSTRING, (WPARAM)-1, (LPARAM)itemData);
need_restart |= (F.flags & FIDF_NEEDRESTART);
- } }
+ }
+ }
// ShowWindow( GetDlgItem(hwndDlg, IDC_STAT_RESTART), (need_restart ? SW_SHOW : SW_HIDE));
@@ -679,7 +687,8 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, if (_tcscmp(C.name, _T("Background")) == 0)
hBkgColourBrush = CreateSolidBrush(C.value);
- } }
+ }
+ }
if ( !hBkgColourBrush)
hBkgColourBrush = CreateSolidBrush(GetSysColor(COLOR_WINDOW));
@@ -698,7 +707,9 @@ static INT_PTR CALLBACK DlgProcLogOptions(HWND hwndDlg, UINT msg, WPARAM wParam, itemData->colour_id = -1;
itemId = SendDlgItemMessage(hwndDlg, IDC_FONTLIST, LB_ADDSTRING, (WPARAM)-1, (LPARAM)itemData);
- } } }
+ }
+ }
+ }
SendDlgItemMessage(hwndDlg, IDC_FONTLIST, WM_SETREDRAW, TRUE, 0);
UpdateWindow( GetDlgItem(hwndDlg, IDC_FONTLIST));
diff --git a/src/modules/fonts/services.cpp b/src/modules/fonts/services.cpp index 35f5c5a321..7ec7d0397b 100644 --- a/src/modules/fonts/services.cpp +++ b/src/modules/fonts/services.cpp @@ -54,7 +54,7 @@ bool ConvertFontID(FontID *fid, FontIDW* fidw) MultiByteToWideChar(code_page, 0, fid->group, -1, fidw->group, 64);
MultiByteToWideChar(code_page, 0, fid->name, -1, fidw->name, 64);
-
+
if (fid->cbSize > FontID_OLDSIZE) {
MultiByteToWideChar(code_page, 0, fid->backgroundGroup, -1, fidw->backgroundGroup, 64);
MultiByteToWideChar(code_page, 0, fid->backgroundName, -1, fidw->backgroundName, 64);
@@ -158,7 +158,6 @@ int GetFontSettingFromDB(char *settings_group, char *prefix, LOGFONT* lf, COLORR mir_snprintf(idstr, SIZEOF(idstr), "%sSize", prefix);
lf->lfHeight = (char)db_get_b(NULL, settings_group, idstr, lf->lfHeight);
-
//wsprintf(idstr, "%sFlags", prefix);
//if (db_get_dw(NULL, settings_group, idstr, 0) & FIDF_SAVEACTUALHEIGHT) {
// HDC hdc = GetDC(0);
@@ -297,7 +296,7 @@ static int sttRegisterFontWorker(FontIDW* font_id, int hLangpack) char idstr[256];
mir_snprintf(idstr, SIZEOF(idstr), "%sFlags", font_id->prefix);
db_set_dw(0, font_id->dbSettingsGroup, idstr, font_id->flags);
-
+
FontInternal* newItem = new FontInternal;
memset(newItem, 0, sizeof(FontInternal));
memcpy(newItem, font_id, font_id->cbSize);
@@ -518,7 +517,8 @@ static INT_PTR sttGetEffectWorker(EffectIDW* effect_id, FONTEFFECT* effect) effect->baseColour = temp.baseColour;
effect->secondaryColour = temp.secondaryColour;
return TRUE;
- } }
+ }
+ }
return FALSE;
}
|