diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:44:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:44:42 +0100 |
| commit | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (patch) | |
| tree | c980d614fec4a5495798be3e79e033229062c3cd /src/gui/modalMenu.h | |
| parent | 28f6a79706b088c37268a59d90878220dc4ef9c7 (diff) | |
| parent | 3af10766fd2b58b068e970266724d7eb10e9316b (diff) | |
| download | dragonfireclient-5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/gui/modalMenu.h')
| -rw-r--r-- | src/gui/modalMenu.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/modalMenu.h b/src/gui/modalMenu.h index 1cb687f82..3fc9124ea 100644 --- a/src/gui/modalMenu.h +++ b/src/gui/modalMenu.h @@ -38,8 +38,8 @@ public: class GUIModalMenu : public gui::IGUIElement { public: - GUIModalMenu(gui::IGUIEnvironment* env, gui::IGUIElement* parent, s32 id, - IMenuManager *menumgr, bool remap_dbl_click = true); + GUIModalMenu(gui::IGUIEnvironment *env, gui::IGUIElement *parent, s32 id, + IMenuManager *menumgr, bool remap_dbl_click = true); virtual ~GUIModalMenu(); void allowFocusRemoval(bool allow); @@ -70,7 +70,7 @@ protected: bool DoubleClickDetection(const SEvent &event); v2s32 m_pointer; - v2s32 m_old_pointer; // Mouse position after previous mouse event + v2s32 m_old_pointer; // Mouse position after previous mouse event v2u32 m_screensize_old; float m_gui_scale; #ifdef __ANDROID__ @@ -92,7 +92,7 @@ private: IMenuManager *m_menumgr; /* If true, remap a double-click (or double-tap) action to ESC. This is so * that, for example, Android users can double-tap to close a formspec. - * + * * This value can (currently) only be set by the class constructor * and the default value for the setting is true. */ |