1
0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2025-04-21 12:27:27 +03:00

Explicitly convert 32-bit integers to 16-bit.

GCC 4.7.0 warns that C++11 considers doing this implicitly ill-formed.
This commit is contained in:
Maarten ter Huurne
2012-04-10 23:01:16 +02:00
parent 46f2edbc76
commit 8f57afcf53
8 changed files with 59 additions and 19 deletions

View File

@@ -59,8 +59,18 @@ bool SettingsDialog::exec() {
voices[sel]->adjustInput();
const int topBarHeight = gmenu2x->skinConfInt["topBarHeight"];
SDL_Rect clipRect = { 0, topBarHeight + 1, gmenu2x->resX - 9, gmenu2x->resY - topBarHeight - 25 };
SDL_Rect touchRect = { 2, topBarHeight + 4, gmenu2x->resX - 12, clipRect.h };
SDL_Rect clipRect = {
0,
static_cast<Sint16>(topBarHeight + 1),
static_cast<Uint16>(gmenu2x->resX - 9),
static_cast<Uint16>(gmenu2x->resY - topBarHeight - 25)
};
SDL_Rect touchRect = {
2,
static_cast<Sint16>(topBarHeight + 4),
static_cast<Uint16>(gmenu2x->resX - 12),
static_cast<Uint16>(clipRect.h)
};
uint rowHeight = gmenu2x->font->getHeight() + 1; // gp2x=15+1 / pandora=19+1
uint numRows = (gmenu2x->resY - topBarHeight - 20) / rowHeight;