Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 13:53:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2

Browse source
This commit is contained in:
Wayne Chen 2018-11-19 09:02:30 -08:00
commit 3555276817
4 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/Application.cpp
View file

@ -2345,8 +2345,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
DependencyManager::get<TabletScriptingInterface>()->preloadSounds(); DependencyManager::get<TabletScriptingInterface>()->preloadSounds();
DependencyManager::get<Keyboard>()->createKeyboard(); DependencyManager::get<Keyboard>()->createKeyboard();
connect(DependencyManager::get<Keyboard>().data(), SIGNAL(keyboardRaisedChanged(bool)), this, SLOT(onKeyboardRaisedChanged(bool)));
_pendingIdleEvent = false; _pendingIdleEvent = false;
_pendingRenderEvent = false; _pendingRenderEvent = false;
@ -6724,7 +6722,7 @@ void Application::hmdVisibleChanged(bool visible) {
} }
} }
void Application::onKeyboardRaisedChanged(bool raised) { void Application::keyboardRaisedChanged(bool raised) {
auto keyboard = DependencyManager::get<Keyboard>().data(); auto keyboard = DependencyManager::get<Keyboard>().data();
auto keyboardParentID = getOverlays().getProperty(keyboard->getAnchorID(), "parentID"); auto keyboardParentID = getOverlays().getProperty(keyboard->getAnchorID(), "parentID");
if (raised && !_loginDialogOverlayID.isNull()) { if (raised && !_loginDialogOverlayID.isNull()) {

2
interface/src/Application.h
View file

@ -393,7 +393,7 @@ public slots:
void hmdVisibleChanged(bool visible); void hmdVisibleChanged(bool visible);
void onKeyboardRaisedChanged(bool raised); void keyboardRaisedChanged(bool raised);
#if (PR_BUILD || DEV_BUILD) #if (PR_BUILD || DEV_BUILD)
void sendWrongProtocolVersionsSignature(bool checked) { ::sendWrongProtocolVersionsSignature(checked); } void sendWrongProtocolVersionsSignature(bool checked) { ::sendWrongProtocolVersionsSignature(checked); }

2
interface/src/ui/Keyboard.cpp
View file

@ -292,7 +292,7 @@ void Keyboard::setRaised(bool raised) {
_capsEnabled = false; _capsEnabled = false;
_typedCharacters.clear(); _typedCharacters.clear();
}); });
emit keyboardRaisedChanged(raised); qApp->keyboardRaisedChanged(raised);
updateTextDisplay(); updateTextDisplay();
} }

3
interface/src/ui/Keyboard.h
View file

@ -101,9 +101,6 @@ public:
QVector<OverlayID> getKeysID(); QVector<OverlayID> getKeysID();
OverlayID getAnchorID(); OverlayID getAnchorID();
signals:
void keyboardRaisedChanged(bool raised);
public slots: public slots:
void handleTriggerBegin(const OverlayID& overlayID, const PointerEvent& event); void handleTriggerBegin(const OverlayID& overlayID, const PointerEvent& event);
void handleTriggerEnd(const OverlayID& overlayID, const PointerEvent& event); void handleTriggerEnd(const OverlayID& overlayID, const PointerEvent& event);