kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Gui: [skip ci] rename handleKeyboardEvent to processKeyboardEvent

Browse Source
This commit is contained in:
wmayer
2021-11-05 12:58:36 +01:00
parent ef100d55e9
commit 5b023b0af5
10 changed files with 64 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Gui/BlenderNavigationStyle.cpp
View File

@@ -117,7 +117,7 @@ SbBool BlenderNavigationStyle::processSoEvent(const SoEvent * const ev)
// Keyboard handling
if (type.isDerivedFrom(SoKeyboardEvent::getClassTypeId())) {
const SoKeyboardEvent * const event = static_cast<const SoKeyboardEvent *>(ev);
processed = handleKeyboardEvent(event, posn);
processed = processKeyboardEvent(event);
}
// Mouse Button / Spaceball Button handling

2
src/Gui/CADNavigationStyle.cpp
View File

@@ -121,7 +121,7 @@ SbBool CADNavigationStyle::processSoEvent(const SoEvent * const ev)
// Keyboard handling
if (type.isDerivedFrom(SoKeyboardEvent::getClassTypeId())) {
const SoKeyboardEvent * const event = static_cast<const SoKeyboardEvent *>(ev);
processed = handleKeyboardEvent(event, posn);
processed = processKeyboardEvent(event);
}
// Mouse Button / Spaceball Button handling

2
src/Gui/InventorNavigationStyle.cpp
View File

@@ -125,7 +125,7 @@ SbBool InventorNavigationStyle::processSoEvent(const SoEvent * const ev)
// Keyboard handling
if (type.isDerivedFrom(SoKeyboardEvent::getClassTypeId())) {
const SoKeyboardEvent * const event = static_cast<const SoKeyboardEvent *>(ev);
processed = handleKeyboardEvent(event, posn);
processed = processKeyboardEvent(event);
}
// Mouse Button / Spaceball Button handling

104
src/Gui/NavigationStyle.cpp
View File

@@ -1387,55 +1387,6 @@ void NavigationStyle::syncModifierKeys(const SoEvent * const ev)
}
}
SbBool NavigationStyle::handleKeyboardEvent(const SoKeyboardEvent * const event, const SbVec2f & posn)
{
SbBool processed = false;
const SbBool press = event->getState() == SoButtonEvent::DOWN ? true : false;
switch (event->getKey()) {
case SoKeyboardEvent::LEFT_CONTROL:
case SoKeyboardEvent::RIGHT_CONTROL:
this->ctrldown = press;
break;
case SoKeyboardEvent::LEFT_SHIFT:
case SoKeyboardEvent::RIGHT_SHIFT:
this->shiftdown = press;
break;
case SoKeyboardEvent::LEFT_ALT:
case SoKeyboardEvent::RIGHT_ALT:
this->altdown = press;
break;
case SoKeyboardEvent::H:
processed = true;
viewer->saveHomePosition();
break;
case SoKeyboardEvent::R:
processed = true;
viewer->resetToHomePosition();
break;
case SoKeyboardEvent::S:
case SoKeyboardEvent::HOME:
case SoKeyboardEvent::LEFT_ARROW:
case SoKeyboardEvent::UP_ARROW:
case SoKeyboardEvent::RIGHT_ARROW:
case SoKeyboardEvent::DOWN_ARROW:
if (!this->isViewing())
this->setViewing(true);
break;
case SoKeyboardEvent::PAGE_UP:
processed = true;
doZoom(viewer->getSoRenderManager()->getCamera(), getDelta(), posn);
break;
case SoKeyboardEvent::PAGE_DOWN:
processed = true;
doZoom(viewer->getSoRenderManager()->getCamera(), -getDelta(), posn);
break;
default:
break;
}
return processed;
}
// The viewer is a state machine, and all changes to the current state
// are made through this call.
void NavigationStyle::setViewingMode(const ViewerMode newmode)
@@ -1664,6 +1615,61 @@ SbBool NavigationStyle::processMotionEvent(const SoMotion3Event * const ev)
return true;
}
SbBool NavigationStyle::processKeyboardEvent(const SoKeyboardEvent * const event)
{
SbBool processed = false;
const SbBool press = event->getState() == SoButtonEvent::DOWN ? true : false;
switch (event->getKey()) {
case SoKeyboardEvent::LEFT_CONTROL:
case SoKeyboardEvent::RIGHT_CONTROL:
this->ctrldown = press;
break;
case SoKeyboardEvent::LEFT_SHIFT:
case SoKeyboardEvent::RIGHT_SHIFT:
this->shiftdown = press;
break;
case SoKeyboardEvent::LEFT_ALT:
case SoKeyboardEvent::RIGHT_ALT:
this->altdown = press;
break;
case SoKeyboardEvent::H:
processed = true;
viewer->saveHomePosition();
break;
case SoKeyboardEvent::R:
processed = true;
viewer->resetToHomePosition();
break;
case SoKeyboardEvent::S:
case SoKeyboardEvent::HOME:
case SoKeyboardEvent::LEFT_ARROW:
case SoKeyboardEvent::UP_ARROW:
case SoKeyboardEvent::RIGHT_ARROW:
case SoKeyboardEvent::DOWN_ARROW:
if (!this->isViewing())
this->setViewing(true);
break;
case SoKeyboardEvent::PAGE_UP:
{
processed = true;
const SbVec2f posn = normalizePixelPos(event->getPosition());
doZoom(viewer->getSoRenderManager()->getCamera(), getDelta(), posn);
break;
}
case SoKeyboardEvent::PAGE_DOWN:
{
processed = true;
const SbVec2f posn = normalizePixelPos(event->getPosition());
doZoom(viewer->getSoRenderManager()->getCamera(), -getDelta(), posn);
break;
}
default:
break;
}
return processed;
}
void NavigationStyle::setPopupMenuEnabled(const SbBool on)
{
this->menuenabled = on;

2
src/Gui/NavigationStyle.h
View File

@@ -152,6 +152,7 @@ public:
int getViewingMode() const;
virtual SbBool processEvent(const SoEvent * const ev);
virtual SbBool processMotionEvent(const SoMotion3Event * const ev);
virtual SbBool processKeyboardEvent(const SoKeyboardEvent * const event);
void setPopupMenuEnabled(const SbBool on);
SbBool isPopupMenuEnabled(void) const;
@@ -215,7 +216,6 @@ protected:
void addToLog(const SbVec2s pos, const SbTime time);
void syncModifierKeys(const SoEvent * const ev);
SbBool handleKeyboardEvent(const SoKeyboardEvent * const event, const SbVec2f & posn);
protected:
struct { // tracking mouse movement in a log

2
src/Gui/OpenCascadeNavigationStyle.cpp
View File

@@ -117,7 +117,7 @@ SbBool OpenCascadeNavigationStyle::processSoEvent(const SoEvent * const ev)
// Keyboard handling
if (type.isDerivedFrom(SoKeyboardEvent::getClassTypeId())) {
const SoKeyboardEvent * const event = static_cast<const SoKeyboardEvent *>(ev);
processed = handleKeyboardEvent(event, posn);
processed = processKeyboardEvent(event);
}
// Mouse Button / Spaceball Button handling

2
src/Gui/OpenSCADNavigationStyle.cpp
View File

@@ -117,7 +117,7 @@ SbBool OpenSCADNavigationStyle::processSoEvent(const SoEvent * const ev)
// Keyboard handling
if (type.isDerivedFrom(SoKeyboardEvent::getClassTypeId())) {
const SoKeyboardEvent * const event = static_cast<const SoKeyboardEvent *>(ev);
processed = handleKeyboardEvent(event, posn);
processed = processKeyboardEvent(event);
}
// Mouse Button / Spaceball Button handling

2
src/Gui/RevitNavigationStyle.cpp
View File

@@ -117,7 +117,7 @@ SbBool RevitNavigationStyle::processSoEvent(const SoEvent * const ev)
// Keyboard handling
if (type.isDerivedFrom(SoKeyboardEvent::getClassTypeId())) {
const SoKeyboardEvent * const event = static_cast<const SoKeyboardEvent *>(ev);
processed = handleKeyboardEvent(event, posn);
processed = processKeyboardEvent(event);
}
// Mouse Button / Spaceball Button handling

2
src/Gui/TinkerCADNavigationStyle.cpp
View File

@@ -117,7 +117,7 @@ SbBool TinkerCADNavigationStyle::processSoEvent(const SoEvent * const ev)
// Keyboard handling
if (type.isDerivedFrom(SoKeyboardEvent::getClassTypeId())) {
const SoKeyboardEvent * const event = static_cast<const SoKeyboardEvent *>(ev);
processed = handleKeyboardEvent(event, posn);
processed = processKeyboardEvent(event);
}
// Mouse Button / Spaceball Button handling

2
src/Gui/TouchpadNavigationStyle.cpp
View File

@@ -117,7 +117,7 @@ SbBool TouchpadNavigationStyle::processSoEvent(const SoEvent * const ev)
// Keyboard handling
if (type.isDerivedFrom(SoKeyboardEvent::getClassTypeId())) {
const SoKeyboardEvent * const event = static_cast<const SoKeyboardEvent *>(ev);
processed = handleKeyboardEvent(event, posn);
processed = processKeyboardEvent(event);
}
// Mouse Button / Spaceball Button handling