From 8360d3cd6f4e4beeb6564363a49e9b4a0de64b15 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Wed, 11 Nov 2015 21:36:27 +0100
Subject: GUI: Do not show splash when ran from launcher

---
 gui/gui-manager.cpp | 2 ++
 gui/gui-manager.h   | 2 ++
 gui/launcher.cpp    | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'gui')

diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp
index 9b6cf5a0b6..20c6d3fa13 100644
--- a/gui/gui-manager.cpp
+++ b/gui/gui-manager.cpp
@@ -64,6 +64,8 @@ GuiManager::GuiManager() : _redrawStatus(kRedrawDisabled), _stateIsSaved(false),
 	_width = _system->getOverlayWidth();
 	_height = _system->getOverlayHeight();
 
+	_launched = false;
+
 	// Clear the cursor
 	memset(_cursor, 0xFF, sizeof(_cursor));
 
diff --git a/gui/gui-manager.h b/gui/gui-manager.h
index 4186a93ccb..26c8d6def9 100644
--- a/gui/gui-manager.h
+++ b/gui/gui-manager.h
@@ -98,6 +98,8 @@ public:
 	 */
 	bool checkScreenChange();
 
+	bool _launched;
+
 protected:
 	enum RedrawStatus {
 		kRedrawDisabled = 0,
diff --git a/gui/launcher.cpp b/gui/launcher.cpp
index 5abf0aba26..bae894cba1 100644
--- a/gui/launcher.cpp
+++ b/gui/launcher.cpp
@@ -683,6 +683,8 @@ LauncherDialog::LauncherDialog()
 
 	// Create Load dialog
 	_loadDialog = new SaveLoadChooser(_("Load game:"), _("Load"), false);
+
+	GUI::GuiManager::instance()._launched = true;
 }
 
 void LauncherDialog::selectTarget(const String &target) {
-- 
cgit v1.2.3


From 2d86f6da9c0ee2ffa80a2b570c148ea337b09cec Mon Sep 17 00:00:00 2001
From: Bastien Bouclet
Date: Sun, 22 Nov 2015 14:18:14 +0100
Subject: GRAPHICS: Introduce a size mode for TrueType fonts

Allows to match Windows font size selection by converting font heights
to point sizes using the TrueType tables.
---
 gui/ThemeEngine.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui')

diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 6562a1d922..536e5192e0 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1459,7 +1459,7 @@ const Graphics::Font *ThemeEngine::loadScalableFont(const Common::String &filena
 	for (Common::ArchiveMemberList::const_iterator i = members.begin(), end = members.end(); i != end; ++i) {
 		Common::SeekableReadStream *stream = (*i)->createReadStream();
 		if (stream) {
-			font = Graphics::loadTTFFont(*stream, pointsize, 0, Graphics::kTTFRenderModeLight,
+			font = Graphics::loadTTFFont(*stream, pointsize, Graphics::kTTFSizeModeCharacter, 0, Graphics::kTTFRenderModeLight,
 #ifdef USE_TRANSLATION
 			                             TransMan.getCharsetMapping()
 #else
-- 
cgit v1.2.3


From 9b53626ce096931a86422dbe56ea3e53ba6e9502 Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Wed, 23 Dec 2015 16:09:51 +0000
Subject: I18N: Regenerate translations data file

---
 gui/themes/translations.dat | Bin 477774 -> 477983 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index f141524ba3..a882cf2c0b 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From edb93f6e90484f043f592145351da407bf99eaee Mon Sep 17 00:00:00 2001
From: Thierry Crozat
Date: Sat, 26 Dec 2015 16:52:40 +0000
Subject: I18N: Update translations data file

---
 gui/themes/translations.dat | Bin 477983 -> 484065 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'gui')

diff --git a/gui/themes/translations.dat b/gui/themes/translations.dat
index a882cf2c0b..3a9804f663 100644
Binary files a/gui/themes/translations.dat and b/gui/themes/translations.dat differ
-- 
cgit v1.2.3


From 55100f224a9cb0e04944cac1ff5f4b234c6aeab9 Mon Sep 17 00:00:00 2001
From: Eugene Sandulenko
Date: Fri, 1 Jan 2016 13:33:23 +0100
Subject: ALL: Update copyright years

---
 gui/about.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gui')

diff --git a/gui/about.cpp b/gui/about.cpp
index daec2b7e48..211542adb3 100644
--- a/gui/about.cpp
+++ b/gui/about.cpp
@@ -57,7 +57,7 @@ enum {
 
 static const char *copyright_text[] = {
 "",
-"C0""Copyright (C) 2001-2015 The ScummVM Team",
+"C0""Copyright (C) 2001-2016 The ScummVM Team",
 "C0""http://www.scummvm.org",
 "",
 "C0""ScummVM is the legal property of its developers, whose names are too numerous to list here. Please refer to the COPYRIGHT file distributed with this binary.",
-- 
cgit v1.2.3