summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-12-10 01:28:03 +0300
committerAndrei Karas <akaras@inbox.ru>2015-12-10 01:33:59 +0300
commit93a30ec5dd65df6f91e028e68f18d6a7965240da (patch)
treef2a7908d565dd1e6f856e8c058fbc40f50dbb1cb /src/gui/widgets
parent07daba6efa05a59271ce4173a2b500b27773e523 (diff)
downloadmanaplus-93a30ec5dd65df6f91e028e68f18d6a7965240da.tar.gz
manaplus-93a30ec5dd65df6f91e028e68f18d6a7965240da.tar.bz2
manaplus-93a30ec5dd65df6f91e028e68f18d6a7965240da.tar.xz
manaplus-93a30ec5dd65df6f91e028e68f18d6a7965240da.zip
Add support for mobileopengl2 backend (still copy from modern opengl).
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/desktop.cpp4
-rw-r--r--src/gui/widgets/tabs/debugwindowtabs.cpp6
2 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/widgets/desktop.cpp b/src/gui/widgets/desktop.cpp
index 9fdc11a61..27fb7dff3 100644
--- a/src/gui/widgets/desktop.cpp
+++ b/src/gui/widgets/desktop.cpp
@@ -183,8 +183,8 @@ void Desktop::setBestFittingWallpaper()
const int height = rect.height;
if (imageHelper->useOpenGL() == RENDER_SOFTWARE &&
- (nWallPaper->getWidth() != width
- || nWallPaper->getHeight() != height))
+ (nWallPaper->getWidth() != width ||
+ nWallPaper->getHeight() != height))
{
// We rescale to obtain a fullscreen wallpaper...
Image *const newRsclWlPpr = resourceManager->getRescaled(
diff --git a/src/gui/widgets/tabs/debugwindowtabs.cpp b/src/gui/widgets/tabs/debugwindowtabs.cpp
index 1dfd56c1a..9fcba548f 100644
--- a/src/gui/widgets/tabs/debugwindowtabs.cpp
+++ b/src/gui/widgets/tabs/debugwindowtabs.cpp
@@ -108,7 +108,11 @@ MapDebugTab::MapDebugTab(const Widget2 *const widget) :
break;
case RENDER_GLES_OPENGL:
// TRANSLATORS: debug window label
- mFPSText = _("%d FPS (mobile OpenGL)");
+ mFPSText = _("%d FPS (mobile OpenGL ES)");
+ break;
+ case RENDER_GLES2_OPENGL:
+ // TRANSLATORS: debug window label
+ mFPSText = _("%d FPS (mobile OpenGL ES 2)");
break;
case RENDER_MODERN_OPENGL:
// TRANSLATORS: debug window label