|
@@ -1043,13 +1043,13 @@ SettingEntry *SettingEntry::FindEntry(ui
|
|
|
* @return Row number of the next row to draw
|
|
|
*/
|
|
|
uint SettingEntry::Draw(GameSettings *settings_ptr, int left, int right, int base_y, uint first_row, uint max_row, uint cur_row, uint parent_last)
|
|
|
{
|
|
|
if (cur_row >= max_row) return cur_row;
|
|
|
|
|
|
bool rtl = _dynlang.text_dir == TD_RTL;
|
|
|
bool rtl = _current_text_dir == TD_RTL;
|
|
|
int offset = rtl ? -4 : 4;
|
|
|
int level_width = rtl ? -LEVEL_WIDTH : LEVEL_WIDTH;
|
|
|
|
|
|
int x = rtl ? right : left;
|
|
|
int y = base_y;
|
|
|
if (cur_row >= first_row) {
|
|
@@ -1123,13 +1123,13 @@ void SettingEntry::DrawSetting(GameSetti
|
|
|
{
|
|
|
const SettingDescBase *sdb = &sd->desc;
|
|
|
const void *var = ResolveVariableAddress(settings_ptr, sd);
|
|
|
bool editable = true;
|
|
|
bool disabled = false;
|
|
|
|
|
|
bool rtl = _dynlang.text_dir == TD_RTL;
|
|
|
bool rtl = _current_text_dir == TD_RTL;
|
|
|
uint buttons_left = rtl ? right - 19 : left;
|
|
|
uint text_left = left + (rtl ? 0 : 25);
|
|
|
uint text_right = right - (rtl ? 25 : 0);
|
|
|
uint button_y = y + (SETTING_HEIGHT - 11) / 2;
|
|
|
|
|
|
/* We do not allow changes of some items when we are a client in a networkgame */
|
|
@@ -1563,13 +1563,13 @@ struct GameSettingsWindow : Window {
|
|
|
|
|
|
uint cur_row = 0;
|
|
|
SettingEntry *pe = _settings_main_page.FindEntry(btn, &cur_row);
|
|
|
|
|
|
if (pe == NULL) return; // Clicked below the last setting of the page
|
|
|
|
|
|
int x = (_dynlang.text_dir == TD_RTL ? this->width - pt.x : pt.x) - SETTINGTREE_LEFT_OFFSET - (pe->level + 1) * LEVEL_WIDTH; // Shift x coordinate
|
|
|
int x = (_current_text_dir == TD_RTL ? this->width - pt.x : pt.x) - SETTINGTREE_LEFT_OFFSET - (pe->level + 1) * LEVEL_WIDTH; // Shift x coordinate
|
|
|
if (x < 0) return; // Clicked left of the entry
|
|
|
|
|
|
if ((pe->flags & SEF_KIND_MASK) == SEF_SUBTREE_KIND) {
|
|
|
pe->d.sub.folded = !pe->d.sub.folded; // Flip 'folded'-ness of the sub-page
|
|
|
|
|
|
this->vscroll->SetCount(_settings_main_page.Length());
|
|
@@ -1628,13 +1628,13 @@ struct GameSettingsWindow : Window {
|
|
|
/* Set up scroller timeout for numeric values */
|
|
|
if (value != oldvalue && !(sd->desc.flags & SGF_MULTISTRING)) {
|
|
|
if (this->clicked_entry != NULL) { // Release previous buttons if any
|
|
|
this->clicked_entry->SetButtons(0);
|
|
|
}
|
|
|
this->clicked_entry = pe;
|
|
|
this->clicked_entry->SetButtons((x >= 10) != (_dynlang.text_dir == TD_RTL) ? SEF_RIGHT_DEPRESSED : SEF_LEFT_DEPRESSED);
|
|
|
this->clicked_entry->SetButtons((x >= 10) != (_current_text_dir == TD_RTL) ? SEF_RIGHT_DEPRESSED : SEF_LEFT_DEPRESSED);
|
|
|
this->flags4 |= WF_TIMEOUT_BEGIN;
|
|
|
_left_button_clicked = false;
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
|
|
@@ -1750,13 +1750,13 @@ void DrawArrowButtons(int x, int y, Colo
|
|
|
DrawFrameRect(x, y + 1, x + 9, y + 9, button_colour, (state == 1) ? FR_LOWERED : FR_NONE);
|
|
|
DrawFrameRect(x + 10, y + 1, x + 19, y + 9, button_colour, (state == 2) ? FR_LOWERED : FR_NONE);
|
|
|
DrawSprite(SPR_ARROW_LEFT, PAL_NONE, x + WD_IMGBTN_LEFT, y + WD_IMGBTN_TOP);
|
|
|
DrawSprite(SPR_ARROW_RIGHT, PAL_NONE, x + WD_IMGBTN_LEFT + 10, y + WD_IMGBTN_TOP);
|
|
|
|
|
|
/* Grey out the buttons that aren't clickable */
|
|
|
bool rtl = _dynlang.text_dir == TD_RTL;
|
|
|
bool rtl = _current_text_dir == TD_RTL;
|
|
|
if (rtl ? !clickable_right : !clickable_left) {
|
|
|
GfxFillRect(x + 1, y + 1, x + 1 + 8, y + 8, colour, FILLRECT_CHECKER);
|
|
|
}
|
|
|
if (rtl ? !clickable_left : !clickable_right) {
|
|
|
GfxFillRect(x + 11, y + 1, x + 11 + 8, y + 8, colour, FILLRECT_CHECKER);
|
|
|
}
|