From a5082ffa5d12483f2e65fe653509989b1314164c Mon Sep 17 00:00:00 2001
From: Tarek Soliman
Date: Fri, 21 Oct 2011 22:54:33 -0500
Subject: KEYMAPPER: Skip GUI keymap when displaying active keymap in keymapper
 dialog

This fixes a problem where opening the keymapper dialog would cause the current game
keymap to be displayed as the active keymap but then changing the keymap selection
back to it would cause the GUI keymap to be displayed as the active one. The GUI keymap
was indeed at the top of the stack but that's not the desired effect.

Also move the pushing and popping of the keymap to Dialog::Open/Close
Also constantify the GUI keymap name
---
 gui/gui-manager.h | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'gui/gui-manager.h')

diff --git a/gui/gui-manager.h b/gui/gui-manager.h
index 10f9e6a29f..addd2e6611 100644
--- a/gui/gui-manager.h
+++ b/gui/gui-manager.h
@@ -126,6 +126,8 @@ protected:
 	byte	_cursor[2048];
 
 	void initKeymap();
+	void pushKeymap();
+	void popKeymap();
 
 	void saveState();
 	void restoreState();
-- 
cgit v1.2.3


From 9f3fbe1bd773664b1e86241e71875cd97230d791 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Sun, 8 Jan 2012 02:33:34 +0100
Subject: GRAPHICS/GUI: Implement kerning support for Font.

This adapts the related graphics code, which is the generic Font API and the
TTF font implementation.

It furthermore adapts the GUI to properly take care of kerning in text input
widgets.
---
 gui/gui-manager.h | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gui/gui-manager.h')

diff --git a/gui/gui-manager.h b/gui/gui-manager.h
index addd2e6611..49542fd001 100644
--- a/gui/gui-manager.h
+++ b/gui/gui-manager.h
@@ -81,6 +81,7 @@ public:
 	int getFontHeight(ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getFontHeight(style); }
 	int getStringWidth(const Common::String &str, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getStringWidth(str, style); }
 	int getCharWidth(byte c, ThemeEngine::FontStyle style = ThemeEngine::kFontStyleBold) const { return _theme->getCharWidth(c, style); }
+	int getKerningOffset(byte left, byte right, ThemeEngine::FontStyle font = ThemeEngine::kFontStyleBold) const { return _theme->getKerningOffset(left, right, font); }
 
 	/**
 	 * Tell the GuiManager to check whether the screen resolution has changed.
-- 
cgit v1.2.3