[Scummvm-cvs-logs] scummvm master -> 73df649fd62f76d4ab6134d69d19471d6506a413

[lordhoto]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
73df649fd6 GUI: Let edit text widgets use a non-bold (aka normal) font.


Commit: 73df649fd62f76d4ab6134d69d19471d6506a413
    https://github.com/scummvm/scummvm/commit/73df649fd62f76d4ab6134d69d19471d6506a413
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-02-25T09:52:47-08:00

Commit Message:
GUI: Let edit text widgets use a non-bold (aka normal) font.

This change was done per request of _sev.

Changed paths:
    gui/themes/scummclassic.zip
    gui/themes/scummmodern.zip
    gui/themes/scummmodern/scummmodern_gfx.stx
    gui/widgets/edittext.cpp



diff --git a/gui/themes/scummclassic.zip b/gui/themes/scummclassic.zip
index 8b2a3e7..d4cfd0c 100644
Binary files a/gui/themes/scummclassic.zip and b/gui/themes/scummclassic.zip differ
diff --git a/gui/themes/scummmodern.zip b/gui/themes/scummmodern.zip
index 8441663..fc4c89c 100644
Binary files a/gui/themes/scummmodern.zip and b/gui/themes/scummmodern.zip differ
diff --git a/gui/themes/scummmodern/scummmodern_gfx.stx b/gui/themes/scummmodern/scummmodern_gfx.stx
index b420ce0..5f7cc69 100644
--- a/gui/themes/scummmodern/scummmodern_gfx.stx
+++ b/gui/themes/scummmodern/scummmodern_gfx.stx
@@ -125,7 +125,7 @@
 		/>
 		<font	id = 'text_normal'
 				file = 'helvb12.bdf'
-				scalable_file = 'FreeSansBold.ttf'
+				scalable_file = 'FreeSans.ttf'
 		/>
 		<font	resolution = 'y<400'
 		   		id = 'text_normal'
diff --git a/gui/widgets/edittext.cpp b/gui/widgets/edittext.cpp
index af8ab8a..4b266e8 100644
--- a/gui/widgets/edittext.cpp
+++ b/gui/widgets/edittext.cpp
@@ -33,6 +33,7 @@ EditTextWidget::EditTextWidget(GuiObject *boss, int x, int y, int w, int h, cons
 	_finishCmd = finishCmd;
 
 	setEditString(text);
+	setFontStyle(ThemeEngine::kFontStyleNormal);
 }
 
 EditTextWidget::EditTextWidget(GuiObject *boss, const String &name, const String &text, const char *tooltip, uint32 cmd, uint32 finishCmd)
@@ -42,6 +43,7 @@ EditTextWidget::EditTextWidget(GuiObject *boss, const String &name, const String
 	_finishCmd = finishCmd;
 
 	setEditString(text);
+	setFontStyle(ThemeEngine::kFontStyleNormal);
 }
 
 void EditTextWidget::setEditString(const String &str) {