diff options
| author | Philipp Sehmisch <crush@themanaworld.org> | 2009-01-27 14:21:30 +0100 |
|---|---|---|
| committer | Philipp Sehmisch <crush@themanaworld.org> | 2009-01-27 14:21:30 +0100 |
| commit | bd86cba28d24134c4aa8db933cb7b662a801865c (patch) | |
| tree | 18500183069c22e3456392941d24324861d23b9b | |
| parent | a8bf33d851c88107a4673ef6fc97b303efb537d8 (diff) | |
| parent | e9c93aaaa463f288ef589589265bfffd90ecc96d (diff) | |
| download | mana-bd86cba28d24134c4aa8db933cb7b662a801865c.tar.gz mana-bd86cba28d24134c4aa8db933cb7b662a801865c.tar.bz2 mana-bd86cba28d24134c4aa8db933cb7b662a801865c.tar.xz mana-bd86cba28d24134c4aa8db933cb7b662a801865c.zip | |
Merge branch 'master' of git@gitorious.org:tmw/eathena
| -rw-r--r-- | src/gui/browserbox.h | 2 | ||||
| -rw-r--r-- | src/gui/gui.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/gui/browserbox.h b/src/gui/browserbox.h index 226be37b..4dc41e3d 100644 --- a/src/gui/browserbox.h +++ b/src/gui/browserbox.h @@ -124,7 +124,7 @@ class BrowserBox : public gcn::Widget, public gcn::MouseListener enum { BLACK = 0x000000, /**< Color 0 */ RED = 0xff0000, /**< Color 1 */ - GREEN = 0x1fa052, /**< Color 2 */ + GREEN = 0x009000, /**< Color 2 */ BLUE = 0x0000ff, /**< Color 3 */ ORANGE = 0xe0980e, /**< Color 4 */ YELLOW = 0xf1dc27, /**< Color 5 */ diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp index 22d94791..2da451a3 100644 --- a/src/gui/gui.cpp +++ b/src/gui/gui.cpp @@ -106,7 +106,8 @@ Gui::Gui(Graphics *graphics): // Set global font std::string path = resman->getPath("fonts/dejavusans.ttf"); try { - mGuiFont = new TrueTypeFont(path, 11); + const int fontSize = config.getValue("fontSize", 11); + mGuiFont = new TrueTypeFont(path, fontSize); } catch (gcn::Exception e) { |