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

Merge pull request #15310 from danteruiz/fix-keyboard-scaling

Browse source 
Case 21513: Keyboad doesn't scale to avatar after reloading content
This commit is contained in:
Shannon Romano 2019-04-17 16:59:42 -07:00 committed by GitHub
commit 6c15719618
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -910,6 +910,9 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) {
}); });
_layerIndex = 0; _layerIndex = 0;
addIncludeItemsToMallets(); addIncludeItemsToMallets();
auto myAvatar = DependencyManager::get<AvatarManager>()->getMyAvatar();
scaleKeyboard(myAvatar->getSensorToWorldScale());
}); });
request->send(); request->send();

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

@ -98,6 +98,7 @@ public:
bool isPassword() const; bool isPassword() const;
void setPassword(bool password); void setPassword(bool password);
void enableRightMallet(); void enableRightMallet();
void scaleKeyboard(float sensorToWorldScale);
void enableLeftMallet(); void enableLeftMallet();
void disableRightMallet(); void disableRightMallet();
void disableLeftMallet(); void disableLeftMallet();
@ -122,7 +123,6 @@ public slots:
void handleTriggerContinue(const QUuid& id, const PointerEvent& event); void handleTriggerContinue(const QUuid& id, const PointerEvent& event);
void handleHoverBegin(const QUuid& id, const PointerEvent& event); void handleHoverBegin(const QUuid& id, const PointerEvent& event);
void handleHoverEnd(const QUuid& id, const PointerEvent& event); void handleHoverEnd(const QUuid& id, const PointerEvent& event);
void scaleKeyboard(float sensorToWorldScale);
private: private:
struct Anchor { struct Anchor {