thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

synced with scummvm

Browse source
This commit is contained in:
Pawel Kolodziejski 2009-10-05 08:33:46 +00:00
parent fca3a20334
commit 7aa79c880d
115 changed files with 5209 additions and 2608 deletions
Download patch file Download diff file Expand all files Collapse all files

64
graphics/VectorRenderer.cpp
View file

@ -83,26 +83,26 @@ void VectorRenderer::stepGetPositions(const DrawStep &step, const Common::Rect &
if (!step.autoWidth) {
in_w = step.w == -1 ? area.height() : step.w;
switch(step.xAlign) {
case Graphics::DrawStep::kVectorAlignManual:
if (step.x >= 0) in_x = area.left + step.x;
else in_x = area.left + area.width() + step.x; // value relative to the opposite corner.
break;
switch (step.xAlign) {
case Graphics::DrawStep::kVectorAlignManual:
if (step.x >= 0) in_x = area.left + step.x;
else in_x = area.left + area.width() + step.x; // value relative to the opposite corner.
break;
case Graphics::DrawStep::kVectorAlignCenter:
in_x = area.left + (area.width() / 2) - (in_w / 2);
break;
case Graphics::DrawStep::kVectorAlignCenter:
in_x = area.left + (area.width() / 2) - (in_w / 2);
break;
case Graphics::DrawStep::kVectorAlignLeft:
in_x = area.left;
break;
case Graphics::DrawStep::kVectorAlignLeft:
in_x = area.left;
break;
case Graphics::DrawStep::kVectorAlignRight:
in_x = area.left + area.width() - in_w;
break;
case Graphics::DrawStep::kVectorAlignRight:
in_x = area.left + area.width() - in_w;
break;
default:
error("Vertical alignment in horizontal data.");
default:
error("Vertical alignment in horizontal data.");
}
} else {
in_x = area.left;
@ -112,26 +112,26 @@ void VectorRenderer::stepGetPositions(const DrawStep &step, const Common::Rect &
if (!step.autoHeight) {
in_h = step.h == -1 ? area.width() : step.h;
switch(step.yAlign) {
case Graphics::DrawStep::kVectorAlignManual:
if (step.y >= 0) in_y = area.top + step.y;
else in_y = area.top + area.height() + step.y; // relative
break;
switch (step.yAlign) {
case Graphics::DrawStep::kVectorAlignManual:
if (step.y >= 0) in_y = area.top + step.y;
else in_y = area.top + area.height() + step.y; // relative
break;
case Graphics::DrawStep::kVectorAlignCenter:
in_y = area.top + (area.height() / 2) - (in_h / 2);
break;
case Graphics::DrawStep::kVectorAlignCenter:
in_y = area.top + (area.height() / 2) - (in_h / 2);
break;
case Graphics::DrawStep::kVectorAlignTop:
in_y = area.top;
break;
case Graphics::DrawStep::kVectorAlignTop:
in_y = area.top;
break;
case Graphics::DrawStep::kVectorAlignBottom:
in_y = area.top + area.height() - in_h;
break;
case Graphics::DrawStep::kVectorAlignBottom:
in_y = area.top + area.height() - in_h;
break;
default:
error("Horizontal alignment in vertical data.");
default:
error("Horizontal alignment in vertical data.");
}
} else {
in_y = area.top;