(svn r21157) -Codechange: remove information about the text direction out of the language "list"

This commit is contained in:
rubidium
2010-11-13 09:56:25 +00:00
parent 43f807a918
commit 30637a8340
34 changed files with 86 additions and 85 deletions

View File

@@ -450,7 +450,7 @@ public:
break;
case SLW_LIST: {
bool rtl = _dynlang.text_dir == TD_RTL;
bool rtl = _current_text_dir == TD_RTL;
int max = min(this->vscroll->GetPosition() + this->vscroll->GetCapacity(), this->stations.Length());
int y = r.top + WD_FRAMERECT_TOP;
for (int i = this->vscroll->GetPosition(); i < max; ++i) { // do until max number of stations of owner
@@ -850,7 +850,7 @@ static void DrawCargoIcons(CargoID i, uint waiting, int left, int right, int y)
SpriteID sprite = CargoSpec::Get(i)->GetCargoIcon();
int x = _dynlang.text_dir == TD_RTL ? right - num * 10 : left;
int x = _current_text_dir == TD_RTL ? right - num * 10 : left;
do {
DrawSprite(sprite, PAL_NONE, x, y);
x += 10;
@@ -1059,7 +1059,7 @@ struct StationViewWindow : public Window {
y += FONT_HEIGHT_NORMAL;
}
bool rtl = _dynlang.text_dir == TD_RTL;
bool rtl = _current_text_dir == TD_RTL;
int text_left = rtl ? r.left + this->expand_shrink_width : r.left + WD_FRAMERECT_LEFT;
int text_right = rtl ? r.right - WD_FRAMERECT_LEFT : r.right - this->expand_shrink_width;
int shrink_left = rtl ? r.left + WD_FRAMERECT_LEFT : r.right - this->expand_shrink_width + WD_FRAMERECT_LEFT;