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/nsImageControlFrame.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/nsImageControlFrame.cpp')
| -rw-r--r-- | layout/forms/nsImageControlFrame.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp index 8aef41538..212fa9356 100644 --- a/layout/forms/nsImageControlFrame.cpp +++ b/layout/forms/nsImageControlFrame.cpp @@ -150,9 +150,15 @@ nsImageControlFrame::HandleEvent(nsPresContext* aPresContext, return NS_OK; } - if (IsContentDisabled()) { + // do we have user-input style? + const nsStyleUserInterface* uiStyle = StyleUserInterface(); + if (uiStyle->mUserInput == StyleUserInput::None || + uiStyle->mUserInput == StyleUserInput::Disabled) { return nsFrame::HandleEvent(aPresContext, aEvent, aEventStatus); } + if (mContent->HasAttr(kNameSpaceID_None, nsGkAtoms::disabled)) { // XXX cache disabled + return NS_OK; + } *aEventStatus = nsEventStatus_eIgnore; |