0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring, move the classes decending from tshape...

Browse source 
...from canvas.hpp to canvas.cpp. They are an implementation detail,
this allows some more interesting implementation changes later.
This commit is contained in:
Mark de Wever 2008-04-10 17:27:43 +00:00
parent 02edf952bf
commit 0ff7b16a5b
2 changed files with 673 additions and 657 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1220
src/gui/widgets/canvas.cpp
View file

File diff suppressed because it is too large Load diff

110
src/gui/widgets/canvas.hpp
View file

@ -48,6 +48,7 @@ class tcanvas
public:
//! Base class for all other shapes.
//! The other shapes are declared and defined in canvas.cpp.
class tshape : public reference_counted_object
{
public:
@ -68,115 +69,6 @@ public:
typedef boost::intrusive_ptr<tshape> tshape_ptr;
typedef boost::intrusive_ptr<const tshape> const_tshape_ptr;
//! Definition of a line shape.
class tline : public tshape
{
public:
tline(const config& cfg);
//! Implement shape::draw().
void draw(surface& canvas,
const game_logic::map_formula_callable& variables);
private:
unsigned x1_, y1_;
unsigned x2_, y2_;
std::string
x1_formula_,
y1_formula_,
x2_formula_,
y2_formula_;
Uint32 colour_;
//! The thickness of the line:
//! if the value is odd the x and y are the middle of the line.
//! if the value is even the x and y are the middle of a line
//! with width - 1. (0 is special case, does nothing.)
unsigned thickness_;
};
//! Definition of a rectangle shape.
class trectangle : public tshape
{
public:
trectangle(const config& cfg);
//! Implement shape::draw().
void draw(surface& canvas,
const game_logic::map_formula_callable& variables);
private:
unsigned x_, y_;
unsigned w_, h_;
std::string
x_formula_,
y_formula_,
w_formula_,
h_formula_;
//! Border thickness if 0 the fill colour is used for the entire
//! widget.
unsigned border_thickness_;
Uint32 border_colour_;
Uint32 fill_colour_;
};
//! Definition of an image shape.
class timage : public tshape
{
public:
timage(const config& cfg);
//! Implement shape::draw().
void draw(surface& canvas,
const game_logic::map_formula_callable& variables);
private:
unsigned x_, y_;
unsigned w_, h_;
std::string
x_formula_,
y_formula_,
w_formula_,
h_formula_;
SDL_Rect src_clip_;
SDL_Rect dst_clip_;
surface image_;
bool stretch_;
};
//! Definition of a text shape.
class ttext : public tshape
{
public:
ttext(const config& cfg);
//! Implement shape::draw().
void draw(surface& canvas,
const game_logic::map_formula_callable& variables);
private:
unsigned x_, y_;
unsigned w_, h_;
std::string
x_formula_,
y_formula_,
w_formula_,
h_formula_;
unsigned font_size_;
Uint32 colour_;
t_string text_;
std::string text_formula_;
};
tcanvas();
tcanvas(const config& cfg);