diff options
| author | athenian200 <athenian200@outlook.com> | 2020-05-20 23:25:37 -0500 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-05-23 16:10:40 +0200 |
| commit | c4ed56660230a124fa3457cd5f789e78a3188515 (patch) | |
| tree | 0edc55305d449c3851ecc2ad1df8961cc2df7a3b /layout/forms/nsFormControlFrame.cpp | |
| parent | 99c2e698d2a3c56649e42d8d2133706cd8c9501e (diff) | |
| download | UXP-c4ed56660230a124fa3457cd5f789e78a3188515.tar UXP-c4ed56660230a124fa3457cd5f789e78a3188515.tar.gz UXP-c4ed56660230a124fa3457cd5f789e78a3188515.tar.lz UXP-c4ed56660230a124fa3457cd5f789e78a3188515.tar.xz UXP-c4ed56660230a124fa3457cd5f789e78a3188515.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/nsFormControlFrame.cpp')
| -rw-r--r-- | layout/forms/nsFormControlFrame.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/layout/forms/nsFormControlFrame.cpp b/layout/forms/nsFormControlFrame.cpp index 8dbe564dd..4ee62acbf 100644 --- a/layout/forms/nsFormControlFrame.cpp +++ b/layout/forms/nsFormControlFrame.cpp @@ -183,8 +183,10 @@ nsFormControlFrame::HandleEvent(nsPresContext* aPresContext, WidgetGUIEvent* aEvent, nsEventStatus* aEventStatus) { - // Check for disabled content so that selection works properly (?). - if (IsContentDisabled()) { + // Check for user-input:none style + const nsStyleUserInterface* uiStyle = StyleUserInterface(); + if (uiStyle->mUserInput == StyleUserInput::None || + uiStyle->mUserInput == StyleUserInput::Disabled) { return nsFrame::HandleEvent(aPresContext, aEvent, aEventStatus); } return NS_OK; |