diff options
| author | athenian200 <athenian200@outlook.com> | 2020-05-20 23:25:37 -0500 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2020-05-21 13:10:27 +0000 |
| commit | 8b44473fe65a1dd6eb30525e0d4f1370010b2d54 (patch) | |
| tree | 9c53472972470607131bdf2978d4ec73993f4d0d /layout/forms/nsComboboxControlFrame.cpp | |
| parent | 6e0aee959ecc485297c2da5bc9229d3cff13ccc4 (diff) | |
| download | UXP-8b44473fe65a1dd6eb30525e0d4f1370010b2d54.tar UXP-8b44473fe65a1dd6eb30525e0d4f1370010b2d54.tar.gz UXP-8b44473fe65a1dd6eb30525e0d4f1370010b2d54.tar.lz UXP-8b44473fe65a1dd6eb30525e0d4f1370010b2d54.tar.xz UXP-8b44473fe65a1dd6eb30525e0d4f1370010b2d54.zip | |
Revert "Merge pull request #1357 from athenian200/form-disabled-issue"
This reverts commit ed88b99849156004c04e4a0c87ea9b2360ef19b6, reversing
changes made to c4b0715baaffc541670fd1158557aa7e61e521d3.
Diffstat (limited to 'layout/forms/nsComboboxControlFrame.cpp')
| -rw-r--r-- | layout/forms/nsComboboxControlFrame.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index 78185616f..5a9438939 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -1165,7 +1165,9 @@ nsComboboxControlFrame::HandleEvent(nsPresContext* aPresContext, // If we have style that affects how we are selected, feed event down to // nsFrame::HandleEvent so that selection takes place when appropriate. - if (IsContentDisabled()) { + const nsStyleUserInterface* uiStyle = StyleUserInterface(); + if (uiStyle->mUserInput == StyleUserInput::None || + uiStyle->mUserInput == StyleUserInput::Disabled) { return nsBlockFrame::HandleEvent(aPresContext, aEvent, aEventStatus); } return NS_OK; |