From 9e30dda7206361c130079ca994ad104d17ab7459 Mon Sep 17 00:00:00 2001 From: zuu Date: Fri, 13 Sep 2013 20:17:07 +0000 Subject: (svn r25766) -Codechange: Use FONT_HEIGHT_NORMAL instead of checking the height of a dummy string in Story gui --- src/story_gui.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/story_gui.cpp b/src/story_gui.cpp index b6f02552d..7d9790e37 100644 --- a/src/story_gui.cpp +++ b/src/story_gui.cpp @@ -326,7 +326,7 @@ protected: case SPET_GOAL: case SPET_LOCATION: { Dimension sprite_dim = GetSpriteSize(GetPageElementSprite(pe)); - int line_height = GetStringHeight(STR_JUST_NOTHING, INT_MAX); + int line_height = FONT_HEIGHT_NORMAL; if (line_height == 0) return 1; return max((uint)1, sprite_dim.height / (uint)line_height); break; @@ -498,7 +498,7 @@ public: _cur_dpi = &tmp_dpi; /* Draw content (now coordinates given to Draw** are local to the new clipping region). */ - int line_height = GetStringHeight(STR_JUST_NOTHING, INT_MAX); + int line_height = FONT_HEIGHT_NORMAL; int y_offset = - this->vscroll->GetPosition() * line_height; /* Date */ @@ -549,7 +549,8 @@ public: { if (widget != WID_SB_SEL_PAGE && widget != WID_SB_PAGE_PANEL) return; - Dimension d = GetStringBoundingBox(STR_JUST_NOTHING); + Dimension d; + d.height= FONT_HEIGHT_NORMAL; d.width = 0; switch(widget) { -- cgit v1.2.3-70-g09d2