Merge branch 'main' into voice
This commit is contained in:
commit
cf09616b1b
@ -117,11 +117,11 @@ namespace Star {
|
|||||||
inline void release() { released = ++releases; held = false; }
|
inline void release() { released = ++releases; held = false; }
|
||||||
};
|
};
|
||||||
|
|
||||||
// Get pointer to the singleton root instance, if it exists. Otherwise,
|
// Get pointer to the singleton Input instance, if it exists. Otherwise,
|
||||||
// returns nullptr.
|
// returns nullptr.
|
||||||
static Input* singletonPtr();
|
static Input* singletonPtr();
|
||||||
|
|
||||||
// Gets reference to GuiContext singleton, throws GuiContextException if root
|
// Gets reference to Input singleton, throws InputException if root
|
||||||
// is not initialized.
|
// is not initialized.
|
||||||
static Input& singleton();
|
static Input& singleton();
|
||||||
|
|
||||||
@ -186,6 +186,7 @@ namespace Star {
|
|||||||
KeyMod m_pressedMods;
|
KeyMod m_pressedMods;
|
||||||
bool m_textInputActive;
|
bool m_textInputActive;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
Loading…
Reference in New Issue
Block a user