Ticket #8388: scaleableGui-v2.patch

graphics/font.cpp

@@ -37 +37 @@
         return desc.width[chr - desc.firstchar];
 }
 
-void NewFont::drawChar(const Surface *dst, byte chr, int tx, int ty, uint32 color) const {
+void NewFont::drawChar(const Surface *dst, byte chr, int tx, int ty, uint32 color, bool scale) const {
         assert(dst != 0);
-        const int scaleFactorWidth = g_gui.getScaleFactorWidth(), scaleFactorHeight = g_gui.getScaleFactorHeight();
+        const int scaleFactorWidth = scale ? g_gui.getScaleFactorWidth() : 1, scaleFactorHeight = scale ? g_gui.getScaleFactorHeight() : 1;
         tx *= scaleFactorWidth; ty *= scaleFactorHeight;
 
         byte *ptr = (byte *)dst->getBasePtr(tx, ty);
@@ -102 +102 @@
         return space;
 }
 
-void Font::drawString(const Surface *dst, const Common::String &s, int x, int y, int w, uint32 color, TextAlignment align, int deltax, bool useEllipsis) const {
+void Font::drawString(const Surface *dst, const Common::String &s, int x, int y, int w, uint32 color, TextAlignment align, int deltax, bool useEllipsis, bool scale) const {
         assert(dst != 0);
         const int leftX = x, rightX = x + w;
         uint i;
@@ -167 +167 @@
                 if (x+w > rightX)
                         break;
                 if (x >= leftX)
-                        drawChar(dst, str[i], x, y, color);
+                        drawChar(dst, str[i], x, y, color, scale);
                 x += w;
         }
 }

graphics/font.h

@@ -35 +35 @@
 
 /**
  * Instances of this class represent a distinct font, with a built-in renderer.
- * @todo Maybe move the high-level methods (drawString etc.) to a separate 
+ * @todo Maybe move the high-level methods (drawString etc.) to a separate
  *       FontRenderer class? That way, we could have different variants... ?
  * @todo Add more parameters to drawString, or additional similar methods,
  *       featuring abilities like
@@ -52 +52 @@
         virtual int getMaxCharWidth() const = 0;
 
         virtual int getCharWidth(byte chr) const = 0;
-        virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color) const = 0;
+        virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color, bool scale = false) const = 0;
 
-        void drawString(const Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlignment align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true) const;
+        void drawString(const Surface *dst, const Common::String &str, int x, int y, int w, uint32 color, TextAlignment align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true, bool scale = false) const;
         int getStringWidth(const Common::String &str) const;
 };
 
@@ -65 +65 @@
         virtual int getMaxCharWidth() const { return 8; };
 
         virtual int getCharWidth(byte chr) const;
-        virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color) const;
+        virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color, bool scale) const;
 };
 
 extern const ScummFont g_scummfont;
@@ -96 +96 @@
 
 public:
         NewFont(const FontDesc &d) : desc(d) {}
-        
+
         virtual int getFontHeight() const { return desc.height; }
         virtual int getMaxCharWidth() const { return desc.maxwidth; };
 
         virtual int getCharWidth(byte chr) const;
-        virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color) const;
+        virtual void drawChar(const Surface *dst, byte chr, int x, int y, uint32 color, bool scale) const;
 };
 
 extern const NewFont g_sysfont;

graphics/scummfont.cpp

@@ -63 +63 @@
 }
 
 //void ScummFont::drawChar(byte chr, int xx, int yy, OverlayColor color) {
-void ScummFont::drawChar(const Surface *dst, byte chr, int tx, int ty, uint32 color) const {
+void ScummFont::drawChar(const Surface *dst, byte chr, int tx, int ty, uint32 color, bool scale) const {
         assert(dst != 0);
-        const int scaleFactorWidth = g_gui.getScaleFactorWidth(), scaleFactorHeight = g_gui.getScaleFactorHeight();
+        const int scaleFactorWidth = scale ? g_gui.getScaleFactorWidth() : 1, scaleFactorHeight = scale ? g_gui.getScaleFactorHeight() : 1;
         tx *= scaleFactorWidth; ty *= scaleFactorHeight;
 
         byte *ptr = (byte *)dst->getBasePtr(tx, ty);

gui/console.cpp

@@ -49 +49 @@
  * - a *lot* of others things, this code is in no way complete and heavily under progress
  */
 ConsoleDialog::ConsoleDialog(float widthPercent, float heightPercent)
-        : Dialog(0, 0, 1, 1), 
+        : Dialog(0, 0, 1, 1),
         _widthPercent(widthPercent), _heightPercent(heightPercent) {
-        
+
         // Setup basic layout/dialog size
         reflowLayout();
 
@@ -111 +111 @@
 }
 
 void ConsoleDialog::open() {
+        g_gui.enableScaling(false);
+
         // Initiate sliding the console down. We do a very simple trick to achieve
         // this effect: we simply move the console dialog just above (outside) the
         // visible screen area, then shift it down in handleTickle() over a
-        // certain period of time. 
+        // certain period of time.
         _y = -_h;
         _slideTime = g_system->getMillis();
         _slideMode = kDownSlideMode;
@@ -165 +167 @@
                 _caretTime = time + kCaretBlinkTime;
                 drawCaret(_caretVisible);
         }
-        
+
         // Perform the "slide animation".
         if (_slideMode != kNoSlideMode) {
                 const float tmp = (float)(g_system->getMillis() - _slideTime) / kConsoleSlideDownDuration;
@@ -174 +176 @@
                 } else {
                         _y = (int)(_h * (tmp - 1.0));
                 }
-                
+
                 if (_slideMode == kDownSlideMode && _y > 0) {
                         // End the slide
                         _slideMode = kNoSlideMode;
@@ -195 +197 @@
 
 void ConsoleDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {
         int i;
-        
+
         if (_slideMode != kNoSlideMode)
                 return;
 
@@ -204 +206 @@
         case '\r': {
                 if (_caretVisible)
                         drawCaret(true);
-                        
+
                 nextLine();
 
                 assert(_promptEndPos >= _promptStartPos);
@@ -217 +219 @@
                         // We have to allocate the string buffer with new, since VC++ sadly does not
                         // comply to the C++ standard, so we can't use a dynamic sized stack array.
                         char *str = new char[len + 1];
-        
+
                         // Copy the user input to str
                         for (i = 0; i < len; i++)
                                 str[i] = buffer(_promptStartPos + i);

gui/newgui.cpp

@@ -54 +54 @@
 
 
 // Constructor
-NewGui::NewGui() : _needRedraw(false),
+NewGui::NewGui() : _scaleEnable(true), _needRedraw(false),
         _stateIsSaved(false), _cursorAnimateCounter(0), _cursorAnimateTimer(0) {
 
         _system = OSystem::instance();
@@ -79 +79 @@
 }
 
 void NewGui::updateScaleFactor() {
+        if(!_scaleEnable) {
+                _scaleFactorWidth = _scaleFactorHeight = 1;
+                return;
+        }
+
         const int16 stdGuiWidth = 320;
         const int16 stdGuiHeight = 200;
 
@@ -225 +230 @@
         _lastClick.count = 0;
 
         _stateIsSaved = true;
+        _scaleEnable = true;
 }
 
 void NewGui::restoreState() {
@@ -348 +354 @@
 void NewGui::drawChar(byte chr, int xx, int yy, OverlayColor color, const Graphics::Font *font) {
         if (font == 0)
                 font = &getFont();
-        font->drawChar(&_screen, chr, xx, yy, color);
+        font->drawChar(&_screen, chr, xx, yy, color, _scaleEnable);
 }
 
 int NewGui::getStringWidth(const String &str) {
-        return getFont().getStringWidth(str) * _scaleFactorWidth;
+        int width = 0;
+        for (uint p = 0; p < str.size(); p++)
+                width += getCharWidth(str[p]);
+        return width;
 }
 
 int NewGui::getCharWidth(byte c) {
-        return getFont().getCharWidth(c) * _scaleFactorWidth;
+        return getFont().getCharWidth(c) * c != ' ' ? _scaleFactorWidth : 1;
 }
 
 void NewGui::drawString(const String &s, int x, int y, int w, OverlayColor color, TextAlignment align, int deltax, bool useEllipsis) {
-        getFont().drawString(&_screen, s, x, y, w, color, align, deltax, useEllipsis);
+        getFont().drawString(&_screen, s, x, y, w, color, align, deltax, useEllipsis, _scaleEnable);
 }
 
 //

gui/newgui.h

@@ -68 +68 @@
 
         int getScaleFactorWidth() { return _scaleFactorWidth; }
         int getScaleFactorHeight() { return _scaleFactorHeight; }
+        void enableScaling(bool enable) { _scaleEnable = enable; updateScaleFactor(); }
 
 protected:
         OSystem                 *_system;
@@ -76 +77 @@
 
         int                     _scaleFactorWidth;
         int                     _scaleFactorHeight;
+        bool                    _scaleEnable;
 
         bool            _needRedraw;
         DialogStack     _dialogStack;