Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-02 01:48:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the focused state for textfields. Not part of the build.

Browse Source
This commit is contained in:
bryner%netscape.com 2005-08-20 07:12:23 +00:00
parent 330910f4b0
commit b4695d9e0b
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
widget/src/gtk/nsNativeThemeGTK.cpp
View File

@ -73,8 +73,9 @@ nsNativeThemeGTK::nsNativeThemeGTK()
mDisabledAtom = getter_AddRefs(NS_NewAtom("disabled")); mDisabledAtom = getter_AddRefs(NS_NewAtom("disabled"));
mCheckedAtom = getter_AddRefs(NS_NewAtom("checked")); mCheckedAtom = getter_AddRefs(NS_NewAtom("checked"));
mSelectedAtom = getter_AddRefs(NS_NewAtom("selected")); mSelectedAtom = getter_AddRefs(NS_NewAtom("selected"));
mInputCheckedAtom = getter_AddRefs(NS_NewPermanentAtom("_moz-input-checked")); mInputCheckedAtom = getter_AddRefs(NS_NewAtom("_moz-input-checked"));
mInputAtom = getter_AddRefs(NS_NewAtom("input")); mInputAtom = getter_AddRefs(NS_NewAtom("input"));
mFocusedAtom = getter_AddRefs(NS_NewAtom("focused"));
} }
nsNativeThemeGTK::~nsNativeThemeGTK() { nsNativeThemeGTK::~nsNativeThemeGTK() {
@ -283,7 +284,19 @@ nsNativeThemeGTK::DrawWidgetBackground(nsIRenderingContext* aContext,
&state); &state);
break; break;
case NS_THEME_DROPDOWN_TEXTFIELD:
if (aFrame)
// look at the parent frame (the textbox)
aFrame->GetParent(&aFrame);
// fall through
case NS_THEME_TEXTFIELD: case NS_THEME_TEXTFIELD:
// The textfield element isn't actually focused, the inner
// html:input is. Use the focused attribute to get the correct
// state.
state.focused = CheckBooleanAttr(aFrame, mFocusedAtom);
EnsureEntryWidget(); EnsureEntryWidget();
moz_gtk_entry_paint(window, gEntryWidget->style, &gdk_rect, &gdk_clip, moz_gtk_entry_paint(window, gEntryWidget->style, &gdk_rect, &gdk_clip,
&state); &state);
@ -336,6 +349,7 @@ nsNativeThemeGTK::GetWidgetBorder(nsIDeviceContext* aContext, nsIFrame* aFrame,
} }
break; break;
case NS_THEME_TEXTFIELD: case NS_THEME_TEXTFIELD:
case NS_THEME_DROPDOWN_TEXTFIELD:
EnsureEntryWidget(); EnsureEntryWidget();
WidgetBorderToMargin(gEntryWidget, aResult); WidgetBorderToMargin(gEntryWidget, aResult);
break; break;
@ -495,9 +509,11 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsIPresContext* aPresContext,
case NS_THEME_SCROLLBAR_THUMB_VERTICAL: case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL: case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
case NS_THEME_TOOLBAR_BUTTON: case NS_THEME_TOOLBAR_BUTTON:
case NS_THEME_TOOLBAR_DUAL_BUTTON: // so we can override the border with 0
case NS_THEME_TOOLBAR_GRIPPER: case NS_THEME_TOOLBAR_GRIPPER:
case NS_THEME_RADIO: case NS_THEME_RADIO:
case NS_THEME_TEXTFIELD: case NS_THEME_TEXTFIELD:
case NS_THEME_DROPDOWN_TEXTFIELD:
case NS_THEME_DROPDOWN_BUTTON: case NS_THEME_DROPDOWN_BUTTON:
case NS_THEME_TOOLBOX: case NS_THEME_TOOLBOX:
return PR_TRUE; return PR_TRUE;

18
widget/src/gtk2/nsNativeThemeGTK.cpp
View File

@ -73,8 +73,9 @@ nsNativeThemeGTK::nsNativeThemeGTK()
mDisabledAtom = getter_AddRefs(NS_NewAtom("disabled")); mDisabledAtom = getter_AddRefs(NS_NewAtom("disabled"));
mCheckedAtom = getter_AddRefs(NS_NewAtom("checked")); mCheckedAtom = getter_AddRefs(NS_NewAtom("checked"));
mSelectedAtom = getter_AddRefs(NS_NewAtom("selected")); mSelectedAtom = getter_AddRefs(NS_NewAtom("selected"));
mInputCheckedAtom = getter_AddRefs(NS_NewPermanentAtom("_moz-input-checked")); mInputCheckedAtom = getter_AddRefs(NS_NewAtom("_moz-input-checked"));
mInputAtom = getter_AddRefs(NS_NewAtom("input")); mInputAtom = getter_AddRefs(NS_NewAtom("input"));
mFocusedAtom = getter_AddRefs(NS_NewAtom("focused"));
} }
nsNativeThemeGTK::~nsNativeThemeGTK() { nsNativeThemeGTK::~nsNativeThemeGTK() {
@ -283,7 +284,19 @@ nsNativeThemeGTK::DrawWidgetBackground(nsIRenderingContext* aContext,
&state); &state);
break; break;
case NS_THEME_DROPDOWN_TEXTFIELD:
if (aFrame)
// look at the parent frame (the textbox)
aFrame->GetParent(&aFrame);
// fall through
case NS_THEME_TEXTFIELD: case NS_THEME_TEXTFIELD:
// The textfield element isn't actually focused, the inner
// html:input is. Use the focused attribute to get the correct
// state.
state.focused = CheckBooleanAttr(aFrame, mFocusedAtom);
EnsureEntryWidget(); EnsureEntryWidget();
moz_gtk_entry_paint(window, gEntryWidget->style, &gdk_rect, &gdk_clip, moz_gtk_entry_paint(window, gEntryWidget->style, &gdk_rect, &gdk_clip,
&state); &state);
@ -336,6 +349,7 @@ nsNativeThemeGTK::GetWidgetBorder(nsIDeviceContext* aContext, nsIFrame* aFrame,
} }
break; break;
case NS_THEME_TEXTFIELD: case NS_THEME_TEXTFIELD:
case NS_THEME_DROPDOWN_TEXTFIELD:
EnsureEntryWidget(); EnsureEntryWidget();
WidgetBorderToMargin(gEntryWidget, aResult); WidgetBorderToMargin(gEntryWidget, aResult);
break; break;
@ -495,9 +509,11 @@ nsNativeThemeGTK::ThemeSupportsWidget(nsIPresContext* aPresContext,
case NS_THEME_SCROLLBAR_THUMB_VERTICAL: case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL: case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
case NS_THEME_TOOLBAR_BUTTON: case NS_THEME_TOOLBAR_BUTTON:
case NS_THEME_TOOLBAR_DUAL_BUTTON: // so we can override the border with 0
case NS_THEME_TOOLBAR_GRIPPER: case NS_THEME_TOOLBAR_GRIPPER:
case NS_THEME_RADIO: case NS_THEME_RADIO:
case NS_THEME_TEXTFIELD: case NS_THEME_TEXTFIELD:
case NS_THEME_DROPDOWN_TEXTFIELD:
case NS_THEME_DROPDOWN_BUTTON: case NS_THEME_DROPDOWN_BUTTON:
case NS_THEME_TOOLBOX: case NS_THEME_TOOLBOX:
return PR_TRUE; return PR_TRUE;