diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-05-21 15:00:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-21 15:00:59 +0200 |
| commit | 5d6691e9d08dce30b461fced32ece77fd3ff1933 (patch) | |
| tree | f91d5ae02b0c2bcc41a08bb1a594c8a2ebe02eef /layout/base/nsCaret.cpp | |
| parent | 14f6f230d7545d3906a7fd72f3d4677f3b6503d8 (diff) | |
| parent | 0a19762d3bb5f6bcaa00a8f168e469d9fdda76b9 (diff) | |
| download | UXP-5d6691e9d08dce30b461fced32ece77fd3ff1933.tar UXP-5d6691e9d08dce30b461fced32ece77fd3ff1933.tar.gz UXP-5d6691e9d08dce30b461fced32ece77fd3ff1933.tar.lz UXP-5d6691e9d08dce30b461fced32ece77fd3ff1933.tar.xz UXP-5d6691e9d08dce30b461fced32ece77fd3ff1933.zip | |
Merge pull request #1559 from athenian200/form-disabled-issue
Restore -moz-input-disabled and allow events to target disabled form controls.
Diffstat (limited to 'layout/base/nsCaret.cpp')
| -rw-r--r-- | layout/base/nsCaret.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp index 8396726c6..eca22f3ba 100644 --- a/layout/base/nsCaret.cpp +++ b/layout/base/nsCaret.cpp @@ -511,7 +511,7 @@ nsCaret::GetPaintGeometry(nsRect* aRect) CheckSelectionLanguageChange(); int32_t frameOffset; - nsIFrame* frame = GetFrameAndOffset(GetSelectionInternal(), + nsIFrame *frame = GetFrameAndOffset(GetSelectionInternal(), mOverrideContent, mOverrideOffset, &frameOffset); if (!frame) { return nullptr; @@ -521,7 +521,8 @@ nsCaret::GetPaintGeometry(nsRect* aRect) const nsStyleUserInterface* userinterface = frame->StyleUserInterface(); if ((!mIgnoreUserModify && userinterface->mUserModify == StyleUserModify::ReadOnly) || - frame->IsContentDisabled()){ + userinterface->mUserInput == StyleUserInput::None || + userinterface->mUserInput == StyleUserInput::Disabled) { return nullptr; } |