Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue #206: Clear selection after create operation commit
[modules/shaper.git]
/
src
/
ModuleBase
/
ModuleBase_ModelWidget.cpp
diff --git
a/src/ModuleBase/ModuleBase_ModelWidget.cpp
b/src/ModuleBase/ModuleBase_ModelWidget.cpp
index e2b934ee6de130eff7fab5672b876f9a0daf21e6..5a6ba6e1eb5b8032feef6a283c3cc5e09b16c8c1 100644
(file)
--- a/
src/ModuleBase/ModuleBase_ModelWidget.cpp
+++ b/
src/ModuleBase/ModuleBase_ModelWidget.cpp
@@
-26,7
+26,6
@@
ModuleBase_ModelWidget::ModuleBase_ModelWidget(QWidget* theParent, const Config_
myParentId(theParentId)
{
myIsComputedDefault = false;
myParentId(theParentId)
{
myIsComputedDefault = false;
- myIsObligatory = theData ? theData->getBooleanAttribute(FEATURE_OBLIGATORY, true) : true;
myAttributeID = theData ? theData->widgetId() : "";
}
myAttributeID = theData ? theData->widgetId() : "";
}
@@
-39,9
+38,8
@@
void ModuleBase_ModelWidget::enableFocusProcessing()
{
QList<QWidget*> aMyControls = getControls();
foreach(QWidget* eachControl, aMyControls) {
{
QList<QWidget*> aMyControls = getControls();
foreach(QWidget* eachControl, aMyControls) {
- if(!myFocusInWidgets.contains(eachControl)) {
- enableFocusProcessing(eachControl);
- }
+ eachControl->setFocusPolicy(Qt::StrongFocus);
+ eachControl->installEventFilter(this);
}
}
}
}
@@
-92,20
+90,15
@@
void ModuleBase_ModelWidget::updateObject(ObjectPtr theObj) const
ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
}
ModelAPI_EventCreator::get()->sendUpdated(theObj, anEvent);
}
-void ModuleBase_ModelWidget::enableFocusProcessing(QWidget* theWidget)
-{
- theWidget->setFocusPolicy(Qt::StrongFocus);
- theWidget->installEventFilter(this);
- myFocusInWidgets.append(theWidget);
-}
-
bool ModuleBase_ModelWidget::eventFilter(QObject* theObject, QEvent *theEvent)
{
QWidget* aWidget = qobject_cast<QWidget*>(theObject);
bool ModuleBase_ModelWidget::eventFilter(QObject* theObject, QEvent *theEvent)
{
QWidget* aWidget = qobject_cast<QWidget*>(theObject);
- if (theEvent->type() == QEvent::MouseButtonRelease &&
- myFocusInWidgets.contains(aWidget)) {
- emit focusInWidget(this);
+ if (theEvent->type() == QEvent::FocusIn) {
+ if (getControls().contains(aWidget)) {
+ emit focusInWidget(this);
+ }
}
// pass the event on to the parent class
}
// pass the event on to the parent class
+
return QObject::eventFilter(theObject, theEvent);
}
return QObject::eventFilter(theObject, theEvent);
}