diff options
author | athenian200 <athenian200@outlook.com> | 2020-05-20 23:25:37 -0500 |
---|---|---|
committer | athenian200 <athenian200@outlook.com> | 2020-05-20 23:25:37 -0500 |
commit | a965486fcbf3f199b5c7564bfc0526df72c862d5 (patch) | |
tree | b6238d784e74ab2912a35ab14caabe96734bd469 /layout/forms/nsComboboxControlFrame.cpp | |
parent | 3da22ea943f6e7840558ddd1e4b473bef5837873 (diff) | |
download | UXP-a965486fcbf3f199b5c7564bfc0526df72c862d5.tar UXP-a965486fcbf3f199b5c7564bfc0526df72c862d5.tar.gz UXP-a965486fcbf3f199b5c7564bfc0526df72c862d5.tar.lz UXP-a965486fcbf3f199b5c7564bfc0526df72c862d5.tar.xz UXP-a965486fcbf3f199b5c7564bfc0526df72c862d5.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 1064778d6..9db6ae5e4 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -1166,7 +1166,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; |