summaryrefslogtreecommitdiffstats
path: root/layout/forms/nsFormControlFrame.cpp
diff options
context:
space:
mode:
authorathenian200 <athenian200@outlook.com>2020-05-20 23:25:37 -0500
committerMoonchild <moonchild@palemoon.org>2020-05-21 13:10:27 +0000
commit8b44473fe65a1dd6eb30525e0d4f1370010b2d54 (patch)
tree9c53472972470607131bdf2978d4ec73993f4d0d /layout/forms/nsFormControlFrame.cpp
parent6e0aee959ecc485297c2da5bc9229d3cff13ccc4 (diff)
downloadUXP-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/nsFormControlFrame.cpp')
-rw-r--r--layout/forms/nsFormControlFrame.cpp6
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;