diff options
| author | Moonchild <moonchild@palemoon.org> | 2020-01-28 23:03:48 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-28 23:03:48 +0000 |
| commit | ed88b99849156004c04e4a0c87ea9b2360ef19b6 (patch) | |
| tree | 85910991cfd39dc19da5e6ed5526d1a6e6c5ff0a /layout/base/nsCaret.cpp | |
| parent | c4b0715baaffc541670fd1158557aa7e61e521d3 (diff) | |
| parent | 7a697172f36656126d6e415d91b4e260229ee37f (diff) | |
| download | UXP-ed88b99849156004c04e4a0c87ea9b2360ef19b6.tar UXP-ed88b99849156004c04e4a0c87ea9b2360ef19b6.tar.gz UXP-ed88b99849156004c04e4a0c87ea9b2360ef19b6.tar.lz UXP-ed88b99849156004c04e4a0c87ea9b2360ef19b6.tar.xz UXP-ed88b99849156004c04e4a0c87ea9b2360ef19b6.zip | |
Merge pull request #1357 from athenian200/form-disabled-issue
Forms: Click() isn't executing properly when elements are defined disabled
Diffstat (limited to 'layout/base/nsCaret.cpp')
| -rw-r--r-- | layout/base/nsCaret.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/layout/base/nsCaret.cpp b/layout/base/nsCaret.cpp index eca22f3ba..8396726c6 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,8 +521,7 @@ nsCaret::GetPaintGeometry(nsRect* aRect) const nsStyleUserInterface* userinterface = frame->StyleUserInterface(); if ((!mIgnoreUserModify && userinterface->mUserModify == StyleUserModify::ReadOnly) || - userinterface->mUserInput == StyleUserInput::None || - userinterface->mUserInput == StyleUserInput::Disabled) { + frame->IsContentDisabled()){ return nullptr; } |