test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-03 03:38:33 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Filter component has no focus if it is set as 'focusComponent' for window #PL-4884

Browse Source
This commit is contained in:
Maxim Gorbunkov 2015-09-21 14:10:18 +00:00
parent 68cf2c6669
commit 525b3e244e
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gui/src/com/haulmont/cuba/gui/components/filter/FilterDelegateImpl.java
View File

@ -370,7 +370,13 @@ public class FilterDelegateImpl implements FilterDelegate {
setFilterActionsEnabled();
initFilterSelectComponents();
}
requestFocusToParamEditComponent();
if (paramEditComponentToFocus != null)
requestFocusToParamEditComponent();
else if (filtersPopupDisplayed)
filtersPopupButton.requestFocus();
else if (filtersLookupDisplayed) {
filtersLookup.requestFocus();
}
updateWindowCaption();
});
}
@ -2031,6 +2037,8 @@ public class FilterDelegateImpl implements FilterDelegate {
fillConditionsLayout(ConditionsFocusType.FIRST);
requestFocusToParamEditComponent();
updateFilterModifiedIndicator();
} else {
requestFocusToParamEditComponent();
}
});
}