Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
...
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 1 file changed
  • 0 commit comments
  • 1 contributor
Commits on Dec 30, 2013
@bradallred bradallred Console: fix drawing 885a25f
@bradallred bradallred Move FPS counter to bottom left
it was overlapping with the console (which has to be at the top for ios/android)
60b5962
Showing with 6 additions and 6 deletions.
  1. +6 −6 gemrb/core/Interface.cpp
View
12 gemrb/core/Interface.cpp
@@ -1116,8 +1116,6 @@ char *Interface::GetMusicPlaylist(int SongType) const {
return musiclist[SongType];
}
-static const Region bg( 0, 0, 100, 30 );
-
/** this is the main loop */
void Interface::Main()
{
@@ -1131,6 +1129,8 @@ void Interface::Main()
}
Font* fps = GetFont( ( unsigned int ) 0 );
+ // TODO: if we ever want to support dynamic resolution changes this will break
+ const Region fpsRgn( 0, Height - 30, 100, 30 );
char fpsstring[40]={"???.??? fps"};
unsigned long frame = 0, time, timebase;
timebase = GetTickCount();
@@ -1159,8 +1159,8 @@ void Interface::Main()
frame = 0;
sprintf( fpsstring, "%.3f fps", frames );
}
- video->DrawRect( bg, ColorBlack );
- fps->Print( bg,
+ video->DrawRect( fpsRgn, ColorBlack );
+ fps->Print( fpsRgn,
( unsigned char * ) fpsstring, palette,
IE_FONT_ALIGN_LEFT | IE_FONT_ALIGN_MIDDLE, true );
}
@@ -1895,7 +1895,7 @@ int Interface::Init(InterfaceConfig* config)
Log(MESSAGE, "Core", "Setting up the Console...");
QuitFlag = QF_CHANGESCRIPT;
- console = new Console(Region(0, (Height - 25), Width, 25));
+ console = new Console(Region(0, 0, Width, 25));
if (fonts.size() > 0) {
console->SetFont( fonts[0] );
}
@@ -3302,7 +3302,7 @@ void Interface::DrawWindows(bool allow_delete)
// draw the console
if (ConsolePopped) {
- console->Draw( 0, (Height * -1) + console->ControlFrame().h);
+ console->Draw(0, 0);
}
}

No commit comments for this range

Something went wrong with that request. Please try again.