Made some optimizations based on some profiling done by Octalot, as well

as some other optimizations that I could see that cut down on some
unneeded redraws, which in turn improved frame rates slightly.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 8 insertions, 7 deletions

diff --git a/src/gui/ok_dialog.cpp b/src/gui/ok_dialog.cpp
index 23c4d465..9621b389 100644
--- a/src/gui/ok_dialog.cpp
+++ b/src/gui/ok_dialog.cpp
@@ -23,6 +23,7 @@
 #include <guichan/font.hpp>
 
 #include "button.h"
+#include "gui.h"
 #include "ok_dialog.h"
 #include "scrollarea.h"
 #include "textbox.h"
@@ -47,14 +48,15 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
     mTextBox->setTextWrapped(msg, 260);
 
     int numRows = mTextBox->getNumberOfRows();
+    const int fontHeight = getFont()->getHeight();
 
     if (numRows > 1)
     {
-        // 15 == height of each line of text (based on font heights)
         // 14 == row top + bottom graphic pixel heights
-        setContentSize(mTextBox->getMinWidth() + 15, 15 + (numRows * 15) + okButton->getHeight());
+        setContentSize(mTextBox->getMinWidth() + fontHeight, ((numRows + 1) * 
+                       fontHeight) + okButton->getHeight());
         mTextArea->setDimension(gcn::Rectangle(4, 5, mTextBox->getMinWidth() + 5,
-                                               3 + (numRows * 14)));
+                                               3 + (numRows * fontHeight)));
     }
     else
     {
@@ -63,12 +65,12 @@ OkDialog::OkDialog(const std::string &title, const std::string &msg,
             width = getFont()->getWidth(msg);
         if (width < okButton->getWidth())
             width = okButton->getWidth();
-        setContentSize(width + 15, 30 + okButton->getHeight());
+        setContentSize(width + fontHeight, 30 + okButton->getHeight());
         mTextArea->setDimension(gcn::Rectangle(4, 5, width + 5, 17));
     }
 
     okButton->setPosition((mTextBox->getMinWidth() - okButton->getWidth()) / 2,
-                          (numRows * 14) + okButton->getHeight() - 8);
+                          ((numRows - 1) * fontHeight) + okButton->getHeight() + 2);
 
     add(mTextArea);
     add(okButton);
@@ -93,7 +95,6 @@ void OkDialog::action(const gcn::ActionEvent &event)
     }
 
     // Can we receive anything else anyway?
-    if (event.getId() == "ok") {
+    if (event.getId() == "ok")
         scheduleDelete();
-    }
 }