i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Small cleanup.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31902 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2009-07-29 11:21:59 +00:00
parent 337b8534e0
commit 75251adc37
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/DesktopSettings.cpp
+7 -3
View File
@@ -145,7 +145,7 @@ DesktopSettingsPrivate::_Load()
const char* family; const char* family;
const char* style; const char* style;
float size; float size;
int32 hinting;
if (settings.FindString("plain family", &family) == B_OK if (settings.FindString("plain family", &family) == B_OK
&& settings.FindString("plain style", &style) == B_OK && settings.FindString("plain style", &style) == B_OK
&& settings.FindFloat("plain size", &size) == B_OK) { && settings.FindFloat("plain size", &size) == B_OK) {
@@ -153,6 +153,7 @@ DesktopSettingsPrivate::_Load()
fPlainFont.SetStyle(fontStyle); fPlainFont.SetStyle(fontStyle);
fPlainFont.SetSize(size); fPlainFont.SetSize(size);
} }
if (settings.FindString("bold family", &family) == B_OK if (settings.FindString("bold family", &family) == B_OK
&& settings.FindString("bold style", &style) == B_OK && settings.FindString("bold style", &style) == B_OK
&& settings.FindFloat("bold size", &size) == B_OK) { && settings.FindFloat("bold size", &size) == B_OK) {
@@ -160,6 +161,7 @@ DesktopSettingsPrivate::_Load()
fBoldFont.SetStyle(fontStyle); fBoldFont.SetStyle(fontStyle);
fBoldFont.SetSize(size); fBoldFont.SetSize(size);
} }
if (settings.FindString("fixed family", &family) == B_OK if (settings.FindString("fixed family", &family) == B_OK
&& settings.FindString("fixed style", &style) == B_OK && settings.FindString("fixed style", &style) == B_OK
&& settings.FindFloat("fixed size", &size) == B_OK) { && settings.FindFloat("fixed size", &size) == B_OK) {
@@ -168,9 +170,11 @@ DesktopSettingsPrivate::_Load()
fFixedFont.SetStyle(fontStyle); fFixedFont.SetStyle(fontStyle);
fFixedFont.SetSize(size); fFixedFont.SetSize(size);
} }
if (settings.FindInt32("hinting", &hinting) == B_OK) {
int32 hinting;
if (settings.FindInt32("hinting", &hinting) == B_OK)
gDefaultHintingMode = hinting; gDefaultHintingMode = hinting;
}
gFontManager->Unlock(); gFontManager->Unlock();
} }
} }