[Scummvm-cvs-logs] CVS: scummvm/gui console.cpp,1.42,1.43 widget.h,1.35,1.36 newgui.h,1.40,1.41 module.mk,1.11,1.12 newfont.cpp,1.1,NONE scummfont.cpp,1.1,NONE font.cpp,1.3,NONE font.h,1.5,NONE
Max Horn
fingolfin at users.sourceforge.net
Sun Mar 21 13:31:07 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/graphics animation.cpp,NONE,1.1 animation.h,NONE,1.1 font.cpp,NONE,1.1 font.h,NONE,1.1 module.mk,NONE,1.1 newfont.cpp,NONE,1.1 scummfont.cpp,NONE,1.1 surface.h,NONE,1.1
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/sdl graphics.cpp,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/gui
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28570/gui
Modified Files:
console.cpp widget.h newgui.h module.mk
Removed Files:
newfont.cpp scummfont.cpp font.cpp font.h
Log Message:
Moved Surface/Font code into new 'graphics' module
Index: console.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/console.cpp,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- console.cpp 13 Mar 2004 13:03:25 -0000 1.42
+++ console.cpp 21 Mar 2004 21:20:17 -0000 1.43
@@ -25,7 +25,7 @@
#include "base/engine.h"
#include "base/version.h"
-#include "gui/font.h"
+#include "graphics/font.h"
#define kCharWidth g_guifont.getMaxCharWidth()
Index: widget.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/widget.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- widget.h 13 Mar 2004 13:03:25 -0000 1.35
+++ widget.h 21 Mar 2004 21:20:17 -0000 1.36
@@ -23,7 +23,7 @@
#include "common/scummsys.h"
#include "common/str.h"
-#include "gui/font.h"
+#include "graphics/font.h"
#include "gui/object.h"
namespace GUI {
@@ -127,6 +127,7 @@
class StaticTextWidget : public Widget {
protected:
typedef Common::String String;
+ typedef Graphics::TextAlignment TextAlignment;
String _label;
TextAlignment _align;
Index: newgui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/newgui.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- newgui.h 13 Mar 2004 13:22:14 -0000 1.40
+++ newgui.h 21 Mar 2004 21:20:17 -0000 1.41
@@ -25,7 +25,7 @@
#include "common/singleton.h"
#include "common/str.h"
#include "common/system.h" // For events
-#include "gui/font.h"
+#include "graphics/font.h"
// Uncomment the following to enable the new font code:
//#define NEW_FONT_CODE
@@ -43,13 +43,19 @@
// Height of a single text line
#ifdef NEW_FONT_CODE
-#define g_guifont g_sysfont
+#define g_guifont Graphics::g_sysfont
#else
-#define g_guifont g_scummfont
+#define g_guifont Graphics::g_scummfont
#endif
#define kLineHeight (g_guifont.getFontHeight() + 2)
+using Graphics::TextAlignment;
+using Graphics::kTextAlignCenter;
+using Graphics::kTextAlignLeft;
+using Graphics::kTextAlignRight;
+
+
// Extremly simple stack class, doesn't even do any error checking (for now)
class DialogStack {
protected:
@@ -84,7 +90,7 @@
protected:
OSystem *_system;
- Surface _screen;
+ Graphics::Surface _screen;
int _screenPitch;
bool _needRedraw;
@@ -142,7 +148,7 @@
void drawChar(byte c, int x, int y, OverlayColor color);
int getStringWidth(const String &str);
int getCharWidth(byte c);
- void drawString(const String &str, int x, int y, int w, OverlayColor color, TextAlignment align = kTextAlignLeft, int deltax = 0, bool useEllipsis = true);
+ void drawString(const String &str, int x, int y, int w, OverlayColor color, Graphics::TextAlignment align = Graphics::kTextAlignLeft, int deltax = 0, bool useEllipsis = true);
void blitFromBuffer(int x, int y, int w, int h, const byte *buf, int pitch);
void blitToBuffer(int x, int y, int w, int h, byte *buf, int pitch);
Index: module.mk
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui/module.mk,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- module.mk 13 Mar 2004 13:03:25 -0000 1.11
+++ module.mk 21 Mar 2004 21:20:18 -0000 1.12
@@ -17,14 +17,6 @@
gui/TabWidget.o \
gui/widget.o
-# TODO: Move the fonts to a separate dir?
-MODULE_OBJS += \
- gui/font.o \
- gui/scummfont.o \
- gui/newfont.o
-
-
-
MODULE_DIRS += \
gui
--- newfont.cpp DELETED ---
--- scummfont.cpp DELETED ---
--- font.cpp DELETED ---
--- font.h DELETED ---
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/graphics animation.cpp,NONE,1.1 animation.h,NONE,1.1 font.cpp,NONE,1.1 font.h,NONE,1.1 module.mk,NONE,1.1 newfont.cpp,NONE,1.1 scummfont.cpp,NONE,1.1 surface.h,NONE,1.1
- Next message: [Scummvm-cvs-logs] CVS: scummvm/backends/sdl graphics.cpp,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list