Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 23:05:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

simplify some things in base native theme so that the difference between listbox and combobox styling is clear. b=385367 r=cbarrett sr=roc

Browse Source
This commit is contained in:
joshmoz@gmail.com 2007-06-25 08:33:51 -07:00
parent 7b42bb19aa
commit 1fc82e2f45
2 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
widget/src/xpwidgets/nsNativeTheme.cpp
View File

@ -50,29 +50,36 @@
#include "nsThemeConstants.h"
#include "nsIComponentManager.h"
nsMargin nsNativeTheme::sButtonBorderSize(2, 2, 2, 2);
nsMargin nsNativeTheme::sButtonDisabledBorderSize(1, 1, 1, 1);
PRUint8 nsNativeTheme::sButtonActiveBorderStyle = NS_STYLE_BORDER_STYLE_INSET;
PRUint8 nsNativeTheme::sButtonInactiveBorderStyle = NS_STYLE_BORDER_STYLE_OUTSET;
nsMargin nsNativeTheme::sButtonBorderSize(2, 2, 2, 2);
nsMargin nsNativeTheme::sButtonDisabledBorderSize(1, 1, 1, 1);
PRUint8 nsNativeTheme::sButtonActiveBorderStyle = NS_STYLE_BORDER_STYLE_INSET;
PRUint8 nsNativeTheme::sButtonInactiveBorderStyle = NS_STYLE_BORDER_STYLE_OUTSET;
nsILookAndFeel::nsColorID nsNativeTheme::sButtonBorderColorID = nsILookAndFeel::eColor_buttonface;
nsILookAndFeel::nsColorID nsNativeTheme::sButtonDisabledBorderColorID = nsILookAndFeel::eColor_buttonshadow;
nsILookAndFeel::nsColorID nsNativeTheme::sButtonBGColorID = nsILookAndFeel::eColor_buttonface;
nsILookAndFeel::nsColorID nsNativeTheme::sButtonDisabledBGColorID = nsILookAndFeel::eColor_buttonface;
nsMargin nsNativeTheme::sTextfieldBorderSize(2, 2, 2, 2);
PRUint8 nsNativeTheme::sTextfieldBorderStyle = NS_STYLE_BORDER_STYLE_INSET;
nsMargin nsNativeTheme::sTextfieldBorderSize(2, 2, 2, 2);
PRUint8 nsNativeTheme::sTextfieldBorderStyle = NS_STYLE_BORDER_STYLE_INSET;
nsILookAndFeel::nsColorID nsNativeTheme::sTextfieldBorderColorID = nsILookAndFeel::eColor_threedface;
PRBool nsNativeTheme::sTextfieldBGTransparent = PR_FALSE;
PRBool nsNativeTheme::sTextfieldBGTransparent = PR_FALSE;
nsILookAndFeel::nsColorID nsNativeTheme::sTextfieldBGColorID = nsILookAndFeel::eColor__moz_field;
nsILookAndFeel::nsColorID nsNativeTheme::sTextfieldDisabledBGColorID = nsILookAndFeel::eColor_threedface;
nsMargin nsNativeTheme::sListboxBorderSize(2, 2, 2, 2);
PRUint8 nsNativeTheme::sListboxBorderStyle = NS_STYLE_BORDER_STYLE_INSET;
nsMargin nsNativeTheme::sListboxBorderSize(2, 2, 2, 2);
PRUint8 nsNativeTheme::sListboxBorderStyle = NS_STYLE_BORDER_STYLE_INSET;
nsILookAndFeel::nsColorID nsNativeTheme::sListboxBorderColorID = nsILookAndFeel::eColor_threedface;
PRBool nsNativeTheme::sListboxBGTransparent = PR_FALSE;
PRBool nsNativeTheme::sListboxBGTransparent = PR_FALSE;
nsILookAndFeel::nsColorID nsNativeTheme::sListboxBGColorID = nsILookAndFeel::eColor__moz_field;
nsILookAndFeel::nsColorID nsNativeTheme::sListboxDisabledBGColorID = nsILookAndFeel::eColor_threedface;
nsMargin nsNativeTheme::sComboboxBorderSize(2, 2, 2, 2);
PRUint8 nsNativeTheme::sComboboxBorderStyle = NS_STYLE_BORDER_STYLE_INSET;
nsILookAndFeel::nsColorID nsNativeTheme::sComboboxBorderColorID = nsILookAndFeel::eColor_threedface;
PRBool nsNativeTheme::sComboboxBGTransparent = PR_FALSE;
nsILookAndFeel::nsColorID nsNativeTheme::sComboboxBGColorID = nsILookAndFeel::eColor__moz_field;
nsILookAndFeel::nsColorID nsNativeTheme::sComboboxDisabledBGColorID = nsILookAndFeel::eColor_threedface;
nsNativeTheme::nsNativeTheme()
{
}
@ -198,7 +205,8 @@ nsNativeTheme::IsWidgetStyled(nsPresContext* aPresContext, nsIFrame* aFrame,
aWidgetType == NS_THEME_LISTBOX ||
aWidgetType == NS_THEME_DROPDOWN)) {
if (aFrame->GetContent()->IsNodeOfType(nsINode::eHTML)) {
nscolor defaultBGColor, defaultBorderColor;
nscolor defaultBGColor;
nscolor defaultBorderColor;
PRUint8 defaultBorderStyle;
nsMargin defaultBorderSize;
PRBool defaultBGTransparent = PR_FALSE;
@ -233,33 +241,39 @@ nsNativeTheme::IsWidgetStyled(nsPresContext* aPresContext, nsIFrame* aFrame,
case NS_THEME_TEXTFIELD_MULTILINE:
defaultBorderStyle = sTextfieldBorderStyle;
ConvertMarginToAppUnits(sTextfieldBorderSize, defaultBorderSize);
lookAndFeel->GetColor(sTextfieldBorderColorID,
defaultBorderColor);
lookAndFeel->GetColor(sTextfieldBorderColorID, defaultBorderColor);
defaultBGTransparent = sTextfieldBGTransparent;
if (!defaultBGTransparent) {
if (IsDisabled(aFrame))
lookAndFeel->GetColor(sTextfieldDisabledBGColorID,
defaultBGColor);
lookAndFeel->GetColor(sTextfieldDisabledBGColorID, defaultBGColor);
else
lookAndFeel->GetColor(sTextfieldBGColorID,
defaultBGColor);
lookAndFeel->GetColor(sTextfieldBGColorID, defaultBGColor);
}
break;
case NS_THEME_LISTBOX:
case NS_THEME_DROPDOWN:
defaultBorderStyle = sListboxBorderStyle;
ConvertMarginToAppUnits(sListboxBorderSize, defaultBorderSize);
lookAndFeel->GetColor(sListboxBorderColorID,
defaultBorderColor);
lookAndFeel->GetColor(sListboxBorderColorID, defaultBorderColor);
defaultBGTransparent = sListboxBGTransparent;
if (!defaultBGTransparent) {
if (IsDisabled(aFrame))
lookAndFeel->GetColor(sListboxDisabledBGColorID,
defaultBGColor);
lookAndFeel->GetColor(sListboxDisabledBGColorID, defaultBGColor);
else
lookAndFeel->GetColor(sListboxBGColorID,
defaultBGColor);
lookAndFeel->GetColor(sListboxBGColorID, defaultBGColor);
}
break;
case NS_THEME_DROPDOWN:
defaultBorderStyle = sComboboxBorderStyle;
ConvertMarginToAppUnits(sComboboxBorderSize, defaultBorderSize);
lookAndFeel->GetColor(sComboboxBorderColorID, defaultBorderColor);
defaultBGTransparent = sComboboxBGTransparent;
if (!defaultBGTransparent) {
if (IsDisabled(aFrame))
lookAndFeel->GetColor(sComboboxDisabledBGColorID, defaultBGColor);
else
lookAndFeel->GetColor(sComboboxBGColorID, defaultBGColor);
}
break;

7
widget/src/xpwidgets/nsNativeTheme.h
View File

@ -161,4 +161,11 @@ class nsNativeTheme
static PRBool sListboxBGTransparent;
static nsILookAndFeel::nsColorID sListboxBGColorID;
static nsILookAndFeel::nsColorID sListboxDisabledBGColorID;
// comboboxes
static nsMargin sComboboxBorderSize;
static PRUint8 sComboboxBorderStyle;
static nsILookAndFeel::nsColorID sComboboxBorderColorID;
static PRBool sComboboxBGTransparent;
static nsILookAndFeel::nsColorID sComboboxBGColorID;
static nsILookAndFeel::nsColorID sComboboxDisabledBGColorID;
};