diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-02-15 17:01:46 +0300 |
| commit | 382067b05c4fe97bcf0da0143405375ec295f7c6 (patch) | |
| tree | f668cd2595ac0c85f0942f88729d3ff1956676fa /src/touchmanager.h | |
| parent | ee8191705826d978b7793497fdd307536c709bff (diff) | |
| parent | 9b329556e748050c4300174e9bdc72b15e5b8cc5 (diff) | |
| download | plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.gz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.bz2 plus-382067b05c4fe97bcf0da0143405375ec295f7c6.tar.xz plus-382067b05c4fe97bcf0da0143405375ec295f7c6.zip | |
Merge branch 'master' into stable
Diffstat (limited to 'src/touchmanager.h')
| -rw-r--r-- | src/touchmanager.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/touchmanager.h b/src/touchmanager.h index 8668654ec..6f7b96a6d 100644 --- a/src/touchmanager.h +++ b/src/touchmanager.h @@ -151,7 +151,7 @@ class TouchManager final : public ConfigListener void loadKeyboard(); - int getPadSize() + int getPadSize() const { return (mJoystickSize + 2) * 50; } void setInGame(const bool b); @@ -160,7 +160,7 @@ class TouchManager final : public ConfigListener void shutdown(); - void executeAction(const std::string &event); + static void executeAction(const std::string &event); private: TouchItem *mKeyboard; @@ -176,6 +176,8 @@ class TouchManager final : public ConfigListener int mButtonsSize; int mJoystickSize; int mButtonsFormat; + int mWidth; + int mHeight; bool mShow; bool mInGame; bool mTempHideButtons; |