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/nsGfxButtonControlFrame.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/nsGfxButtonControlFrame.cpp')
| -rw-r--r-- | layout/forms/nsGfxButtonControlFrame.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp index df729c1aa..768abbc21 100644 --- a/layout/forms/nsGfxButtonControlFrame.cpp +++ b/layout/forms/nsGfxButtonControlFrame.cpp @@ -203,7 +203,10 @@ nsGfxButtonControlFrame::HandleEvent(nsPresContext* aPresContext, // from being called. The nsFrame::HandleEvent causes the button label // to be selected (Drawn with an XOR rectangle over the label) - 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); } return NS_OK; |