Let the user escape the controls dialog with the global back button (Esc on PC)

This commit is contained in:
Henrik Rydgard 2013-08-17 12:09:50 +02:00
parent 82b59a7e9d
commit f990df6af8
4 changed files with 5 additions and 5 deletions

View file

@ -21,7 +21,7 @@
#include "UI/MiscScreens.h"
class ControlMappingScreen : public UIScreenWithBackground {
class ControlMappingScreen : public UIDialogScreenWithBackground {
public:
ControlMappingScreen() {}
protected:

View file

@ -24,7 +24,7 @@
// set game specific settings, etc.
// Uses GameInfoCache heavily to implement the functionality.
class GameScreen : public DialogScreen {
class GameScreen : public UIDialogScreen {
public:
GameScreen(std::string gamePath) : gamePath_(gamePath) {}

View file

@ -34,9 +34,9 @@ protected:
virtual void DrawBackground(UIContext &dc);
};
class UIDialogScreenWithBackground : public DialogScreen {
class UIDialogScreenWithBackground : public UIDialogScreen {
public:
UIDialogScreenWithBackground() : DialogScreen() {}
UIDialogScreenWithBackground() : UIDialogScreen() {}
protected:
virtual void DrawBackground(UIContext &dc);
};

2
native

@ -1 +1 @@
Subproject commit 5422dead6ab36cd450bf02c4d2ec9350a5943b8c
Subproject commit 17996ccd4c133e2f930e9b7141875a6ed5e24558