Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 260399 disabled textarea/input should use DEFAULT pointer

Browse Source 
r+sr=bzbarsky


git-svn-id: svn://10.0.0.236/trunk@171552 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
ginn.chen%sun.com 2005-04-04 10:35:50 +00:00
parent 14dc3370e1
commit 4e0213be41
4 changed files with 12 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
mozilla/content/events/src/nsEventStateManager.cpp
View File

@ -2304,24 +2304,6 @@ nsEventStateManager::ClearFrameRefs(nsIFrame* aFrame)
return NS_OK;
}
PRBool
nsEventStateManager::CheckDisabled(nsIContent* aContent)
{
nsIAtom *tag = aContent->Tag();
if (((tag == nsHTMLAtoms::input ||
tag == nsHTMLAtoms::select ||
tag == nsHTMLAtoms::textarea ||
tag == nsHTMLAtoms::button) &&
(aContent->IsContentOfType(nsIContent::eHTML))) ||
(tag == nsHTMLAtoms::button &&
aContent->IsContentOfType(nsIContent::eXUL))) {
return aContent->HasAttr(kNameSpaceID_None, nsHTMLAtoms::disabled);
}
return PR_FALSE;
}
void
nsEventStateManager::UpdateCursor(nsPresContext* aPresContext,
nsEvent* aEvent, nsIFrame* aTargetFrame,
@ -2335,22 +2317,12 @@ nsEventStateManager::UpdateCursor(nsPresContext* aPresContext,
cursor = mLockCursor;
}
//If not locked, look for correct cursor
else {
nsIContent* targetContent = nsnull;
if (mCurrentTarget) {
targetContent = mCurrentTarget->GetContent();
}
//If not disabled, check for the right cursor.
if (!targetContent || !CheckDisabled(targetContent)) {
if (aTargetFrame) {
nsIFrame::Cursor framecursor;
if (NS_FAILED(aTargetFrame->GetCursor(aEvent->point, framecursor)))
return; // don't update the cursor if we failed to get it from the frame see bug 118877
cursor = framecursor.mCursor;
container = framecursor.mContainer;
}
}
else if (aTargetFrame) {
nsIFrame::Cursor framecursor;
if (NS_FAILED(aTargetFrame->GetCursor(aEvent->point, framecursor)))
return; // don't update the cursor if we failed to get it from the frame see bug 118877
cursor = framecursor.mCursor;
container = framecursor.mContainer;
}
// Check whether or not to show the busy cursor

1
mozilla/content/events/src/nsEventStateManager.h
View File

@ -195,7 +195,6 @@ protected:
PRInt32 GetNextTabIndex(nsIContent* aParent, PRBool foward);
nsresult SendFocusBlur(nsPresContext* aPresContext, nsIContent *aContent, PRBool aEnsureWindowHasFocus);
PRBool CheckDisabled(nsIContent* aContent);
void EnsureDocument(nsIPresShell* aPresShell);
void EnsureDocument(nsPresContext* aPresContext);
void FlushPendingEvents(nsPresContext* aPresContext);

4
mozilla/layout/forms/resources/content/xbl-forms.css
View File

@ -248,7 +248,7 @@ optgroup[disabled],
select[disabled],
select[disabled]::-moz-display-comboboxcontrol-frame {
color: GrayText;
cursor: default;
cursor: inherit;
}
/* hidden inputs */
@ -270,7 +270,7 @@ input[type="image"] {
}
input[type="image"][disabled] {
cursor: default;
cursor: inherit;
}
input[type="image"]:focus {

6
mozilla/layout/style/forms.css
View File

@ -258,7 +258,7 @@ select[disabled] {
-moz-user-focus: ignore;
color: GrayText;
background-color: ThreeDFace;
cursor: default;
cursor: inherit;
}
option[disabled],
@ -291,7 +291,7 @@ input[type="image"] {
}
input[type="image"][disabled] {
cursor: default;
cursor: inherit;
}
input[type="image"]:focus {
@ -376,6 +376,7 @@ input[type="checkbox"][disabled]:hover:active {
/* same as above, but !important */
color: GrayText ! important;
background-color: ThreeDFace ! important;
cursor: inherit;
}
input[type="checkbox"]:focus,
@ -472,6 +473,7 @@ input[type="submit"][disabled] {
padding: 1px 7px 1px 7px;
border: 1px outset ButtonShadow;
color: GrayText;
cursor: inherit;
}
/*