suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0000911: V0.13- Faces of Solid models cannot be selected when ALT-TAB is used to switch between applications

Browse Source
This commit is contained in:
wmayer 2012-12-27 12:29:44 +01:00
parent 6fe43f9626
commit 97b6128dcd
6 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Gui/BlenderNavigationStyle.cpp
View File

@ -83,6 +83,9 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev)
// which influence the seek mode itself -- these are handled further // which influence the seek mode itself -- these are handled further
// up the inheritance hierarchy. // up the inheritance hierarchy.
if (this->isSeekMode()) { return inherited::processSoEvent(ev); } if (this->isSeekMode()) { return inherited::processSoEvent(ev); }
// Switch off viewing mode (Bug #0000911)
if (!this->isSeekMode() && this->isViewing())
this->setViewing(false); // by default disable viewing mode to render the scene
const SoType type(ev->getTypeId()); const SoType type(ev->getTypeId());

1
src/Gui/CADNavigationStyle.cpp
View File

@ -85,6 +85,7 @@ SbBool CADNavigationStyle::processSoEvent(const SoEvent * const ev)
// up the inheritance hierarchy. // up the inheritance hierarchy.
if (this->isSeekMode()) { return inherited::processSoEvent(ev); } if (this->isSeekMode()) { return inherited::processSoEvent(ev); }
#else #else
// Switch off viewing mode (Bug #0000911)
if (!this->isSeekMode() && this->isViewing()) if (!this->isSeekMode() && this->isViewing())
this->setViewing(false); // by default disable viewing mode to render the scene this->setViewing(false); // by default disable viewing mode to render the scene
#endif #endif

3
src/Gui/InventorNavigationStyle.cpp
View File

@ -83,6 +83,9 @@ SbBool InventorNavigationStyle::processSoEvent(const SoEvent * const ev)
// which influence the seek mode itself -- these are handled further // which influence the seek mode itself -- these are handled further
// up the inheritance hierarchy. // up the inheritance hierarchy.
if (this->isSeekMode()) { return inherited::processSoEvent(ev); } if (this->isSeekMode()) { return inherited::processSoEvent(ev); }
// Switch off viewing mode (Bug #0000911)
if (!this->isSeekMode() && this->isViewing())
this->setViewing(false); // by default disable viewing mode to render the scene
const SoType type(ev->getTypeId()); const SoType type(ev->getTypeId());

20
src/Gui/SoFCUnifiedSelection.cpp
View File

@ -105,8 +105,6 @@ SoFCUnifiedSelection::SoFCUnifiedSelection() : viewer(0)
SO_NODE_SET_SF_ENUM_TYPE (highlightMode, HighlightModes); SO_NODE_SET_SF_ENUM_TYPE (highlightMode, HighlightModes);
highlighted = FALSE; highlighted = FALSE;
bShift = FALSE;
bCtrl = FALSE;
} }
/*! /*!
@ -414,22 +412,6 @@ SoFCUnifiedSelection::handleEvent(SoHandleEventAction * action)
} }
} }
} }
// key press events
else if (event->isOfType(SoKeyboardEvent ::getClassTypeId())) {
SoKeyboardEvent * const e = (SoKeyboardEvent *) event;
if (SoKeyboardEvent::isKeyPressEvent(e,SoKeyboardEvent::LEFT_SHIFT) ||
SoKeyboardEvent::isKeyPressEvent(e,SoKeyboardEvent::RIGHT_SHIFT) )
bShift = true;
if (SoKeyboardEvent::isKeyReleaseEvent(e,SoKeyboardEvent::LEFT_SHIFT) ||
SoKeyboardEvent::isKeyReleaseEvent(e,SoKeyboardEvent::RIGHT_SHIFT) )
bShift = false;
if (SoKeyboardEvent::isKeyPressEvent(e,SoKeyboardEvent::LEFT_CONTROL) ||
SoKeyboardEvent::isKeyPressEvent(e,SoKeyboardEvent::RIGHT_CONTROL) )
bCtrl = true;
if (SoKeyboardEvent::isKeyReleaseEvent(e,SoKeyboardEvent::LEFT_CONTROL) ||
SoKeyboardEvent::isKeyReleaseEvent(e,SoKeyboardEvent::RIGHT_CONTROL) )
bCtrl = false;
}
// mouse press events for (de)selection // mouse press events for (de)selection
else if (event->isOfType(SoMouseButtonEvent::getClassTypeId()) && else if (event->isOfType(SoMouseButtonEvent::getClassTypeId()) &&
selectionMode.getValue() == SoFCUnifiedSelection::ON) { selectionMode.getValue() == SoFCUnifiedSelection::ON) {
@ -449,7 +431,7 @@ SoFCUnifiedSelection::handleEvent(SoHandleEventAction * action)
std::string documentName = vpd->getObject()->getDocument()->getName(); std::string documentName = vpd->getObject()->getDocument()->getName();
std::string objectName = vpd->getObject()->getNameInDocument(); std::string objectName = vpd->getObject()->getNameInDocument();
std::string subElementName = vpd->getElement(pp ? pp->getDetail() : 0); std::string subElementName = vpd->getElement(pp ? pp->getDetail() : 0);
if (bCtrl) { if (event->wasCtrlDown()) {
if (Gui::Selection().isSelected(documentName.c_str() if (Gui::Selection().isSelected(documentName.c_str()
,objectName.c_str() ,objectName.c_str()
,subElementName.c_str())) { ,subElementName.c_str())) {

3
src/Gui/SoFCUnifiedSelection.h
View File

@ -107,9 +107,6 @@ private:
SbBool highlighted; SbBool highlighted;
SoColorPacker colorpacker; SoColorPacker colorpacker;
SbBool bShift;
SbBool bCtrl;
}; };
/** /**

3
src/Gui/TouchpadNavigationStyle.cpp
View File

@ -83,6 +83,9 @@ SbBool TouchpadNavigationStyle::processSoEvent(const SoEvent * const ev)
// which influence the seek mode itself -- these are handled further // which influence the seek mode itself -- these are handled further
// up the inheritance hierarchy. // up the inheritance hierarchy.
if (this->isSeekMode()) { return inherited::processSoEvent(ev); } if (this->isSeekMode()) { return inherited::processSoEvent(ev); }
// Switch off viewing mode (Bug #0000911)
if (!this->isSeekMode() && this->isViewing())
this->setViewing(false); // by default disable viewing mode to render the scene
const SoType type(ev->getTypeId()); const SoType type(ev->getTypeId());