projects
/
supertux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try to force vsyncing for opengl, the desktop resolution detection and vsyncing only...
[supertux.git]
/
src
/
textscroller.hpp
diff --git
a/src/textscroller.hpp
b/src/textscroller.hpp
index
c7803ea
..
5198eb9
100644
(file)
--- a/
src/textscroller.hpp
+++ b/
src/textscroller.hpp
@@
-26,10
+26,11
@@
#include <map>
#include "screen.hpp"
#include <map>
#include "screen.hpp"
-#include "
video/font
.hpp"
+#include "
math/vector
.hpp"
class DrawingContext;
class Surface;
class DrawingContext;
class Surface;
+class Font;
/**
* Helper class for InfoBox: Represents a line of text
/**
* Helper class for InfoBox: Represents a line of text
@@
-37,11
+38,11
@@
class Surface;
class InfoBoxLine
{
private:
class InfoBoxLine
{
private:
- enum LineType { NORMAL, NORMAL_LEFT, SMALL, HEADING, REFERENCE, IMAGE
, SPACER
};
+ enum LineType { NORMAL, NORMAL_LEFT, SMALL, HEADING, REFERENCE, IMAGE};
LineType lineType;
Font* font;
std::string text;
LineType lineType;
Font* font;
std::string text;
- Surface* image;
+ Surface* image;
public:
InfoBoxLine(char format_char, const std::string& text);
public:
InfoBoxLine(char format_char, const std::string& text);
@@
-66,7
+67,7
@@
public:
void scrollup();
void pagedown();
void pageup();
void scrollup();
void pagedown();
void pageup();
-
+
private:
size_t firstline;
std::vector<InfoBoxLine*> lines;
private:
size_t firstline;
std::vector<InfoBoxLine*> lines;
@@
-92,7
+93,7
@@
private:
std::auto_ptr<Surface> background;
std::vector<InfoBoxLine*> lines;
float scroll;
std::auto_ptr<Surface> background;
std::vector<InfoBoxLine*> lines;
float scroll;
+ bool fading;
};
#endif
};
#endif
-