Merge branch 'master' of https://git.cardforge.org/core-developers/forge into mobile-translations02

This commit is contained in:
Peter
2019-09-07 08:56:03 +02:00
519 changed files with 4163 additions and 2356 deletions

View File

@@ -519,7 +519,7 @@ public class SettingsPage extends TabPage<SettingsScreen> {
g.drawText(value.label, font, foreColor, x, y, w, h, false, Align.left, false);
value.drawPrefValue(g, font, foreColor, x, y, w, h);
h += SettingsScreen.SETTING_PADDING;
h += SettingsScreen.SETTING_PADDING;//TODO: adjust settings page description bounds
g.drawText(value.description, SettingsScreen.DESC_FONT, SettingsScreen.DESC_COLOR, x, y + h, w, totalHeight - h + SettingsScreen.getInsets(w), true, Align.left, false);
}
}