History

Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates

Howard Stearns committed 11 years ago

Commit c90845d2 parents dc75b23 a00eb0c1 file · +10 −0Browse files

Showing the changes to interface/src/Application.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Application.cpp+10−0
@@ -719,6 +719,16 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 718 unmodified lines
719 }719 }
720 });720 });
721 721
722 connect(entityScriptingInterface.data(), &EntityScriptingInterface::deletingEntity,
723 [=](const EntityItemID& entityItemID) {
724 if (entityItemID == _keyboardFocusedItem) {
725 _keyboardFocusedItem = UNKNOWN_ENTITY_ID;
726 if (_keyboardFocusHighlight) {
727 _keyboardFocusHighlight->setVisible(false);
728 }
729 }
730 });
731
722 // If the user clicks somewhere where there is NO entity at all, we will release focus732 // If the user clicks somewhere where there is NO entity at all, we will release focus
723 connect(getEntities(), &EntityTreeRenderer::mousePressOffEntity, 733 connect(getEntities(), &EntityTreeRenderer::mousePressOffEntity,
724 [=](const RayToEntityIntersectionResult& entityItemID, const QMouseEvent* event, unsigned int deviceId) {734 [=](const RayToEntityIntersectionResult& entityItemID, const QMouseEvent* event, unsigned int deviceId) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t