mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backout the patch for 251492. Need a better solution for that.

This commit is contained in:
kyle.yuan%sun.com 2004-08-19 06:33:20 +00:00
Родитель e95e48938c
Коммит 1e6644bbd6
12 изменённых файлов: 6 добавлений и 53 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
content/shared/public/nsCSSKeywordList.h
Просмотреть файл

@ -108,8 +108,6 @@ CSS_KEY(-moz-grid-group, _moz_grid_group)
CSS_KEY(-moz-grid-line, _moz_grid_line)
CSS_KEY(-moz-grid, _moz_grid)
CSS_KEY(-moz-groupbox, _moz_groupbox)
CSS_KEY(-moz-gtk2-active, _moz_gtk2_active)
CSS_KEY(-moz-gtk2-activetext, _moz_gtk2_activetext)
CSS_KEY(-moz-gtk2-hovertext, _moz_gtk2_hovertext)
CSS_KEY(-moz-gujarati, _moz_gujarati)
CSS_KEY(-moz-gurmukhi, _moz_gurmukhi)

2
content/shared/src/nsCSSProps.cpp
Просмотреть файл

@ -408,8 +408,6 @@ const PRInt32 nsCSSProps::kColorKTable[] = {
eCSSKeyword__moz_dialogtext, nsILookAndFeel::eColor__moz_dialogtext,
eCSSKeyword__moz_dragtargetzone, nsILookAndFeel::eColor__moz_dragtargetzone,
eCSSKeyword__moz_hyperlinktext, NS_COLOR_MOZ_HYPERLINKTEXT,
eCSSKeyword__moz_gtk2_active, nsILookAndFeel::eColor__moz_gtk2_active,
eCSSKeyword__moz_gtk2_activetext, nsILookAndFeel::eColor__moz_gtk2_activetext,
eCSSKeyword__moz_gtk2_hovertext, nsILookAndFeel::eColor__moz_gtk2_hovertext,
eCSSKeyword__moz_mac_focusring, nsILookAndFeel::eColor__moz_mac_focusring,
eCSSKeyword__moz_mac_menuselect, nsILookAndFeel::eColor__moz_mac_menuselect,

2
layout/style/nsCSSKeywordList.h
Просмотреть файл

@ -108,8 +108,6 @@ CSS_KEY(-moz-grid-group, _moz_grid_group)
CSS_KEY(-moz-grid-line, _moz_grid_line)
CSS_KEY(-moz-grid, _moz_grid)
CSS_KEY(-moz-groupbox, _moz_groupbox)
CSS_KEY(-moz-gtk2-active, _moz_gtk2_active)
CSS_KEY(-moz-gtk2-activetext, _moz_gtk2_activetext)
CSS_KEY(-moz-gtk2-hovertext, _moz_gtk2_hovertext)
CSS_KEY(-moz-gujarati, _moz_gujarati)
CSS_KEY(-moz-gurmukhi, _moz_gurmukhi)

2
layout/style/nsCSSProps.cpp
Просмотреть файл

@ -408,8 +408,6 @@ const PRInt32 nsCSSProps::kColorKTable[] = {
eCSSKeyword__moz_dialogtext, nsILookAndFeel::eColor__moz_dialogtext,
eCSSKeyword__moz_dragtargetzone, nsILookAndFeel::eColor__moz_dragtargetzone,
eCSSKeyword__moz_hyperlinktext, NS_COLOR_MOZ_HYPERLINKTEXT,
eCSSKeyword__moz_gtk2_active, nsILookAndFeel::eColor__moz_gtk2_active,
eCSSKeyword__moz_gtk2_activetext, nsILookAndFeel::eColor__moz_gtk2_activetext,
eCSSKeyword__moz_gtk2_hovertext, nsILookAndFeel::eColor__moz_gtk2_hovertext,
eCSSKeyword__moz_mac_focusring, nsILookAndFeel::eColor__moz_mac_focusring,
eCSSKeyword__moz_mac_menuselect, nsILookAndFeel::eColor__moz_mac_menuselect,

5
themes/classic/global/win/listbox.css
Просмотреть файл

@ -72,13 +72,8 @@ listbox:focus > listitem[current="true"][selected="true"] {
}
listitem[selected="true"] {
#ifdef MOZ_WIDGET_GTK2
background-color: -moz-gtk2-active;
color: -moz-gtk2-activetext
#else
background-color: -moz-Dialog;
color: -moz-DialogText;
#endif
}
listbox:focus > listitem[selected="true"] {

21
themes/classic/global/win/tree.css
Просмотреть файл

@ -77,11 +77,7 @@ treechildren::-moz-tree-row {
}
treechildren::-moz-tree-row(selected) {
#ifdef MOZ_WIDGET_GTK2
background-color: -moz-gtk2-active;
#else
background-color: -moz-Dialog;
#endif
}
treechildren::-moz-tree-row(selected, focus) {
@ -113,11 +109,7 @@ treechildren::-moz-tree-cell-text {
}
treechildren::-moz-tree-cell-text(selected) {
#ifdef MOZ_WIDGET_GTK2
color: -moz-gtk2-activetext;
#else
color: -moz-DialogText;
#endif
}
tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary) {
@ -126,13 +118,8 @@ tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary) {
}
tree[selstyle="primary"] > treechildren::-moz-tree-cell-text(primary, selected) {
#ifdef MOZ_WIDGET_GTK2
background-color: -moz-gtk2-active;
color: -moz-gtk2-activetext;
#else
background-color: -moz-Dialog;
color: -moz-DialogText;
#endif
}
treechildren::-moz-tree-cell-text(selected, focus) {
@ -348,19 +335,11 @@ treechildren[alternatingbackground="true"]::-moz-tree-row(odd) {
}
treechildren[alternatingbackground="true"]::-moz-tree-row(odd, selected) {
#ifdef MOZ_WIDGET_GTK2
background-color: -moz-gtk2-active;
#else
background-color: -moz-Dialog;
#endif
}
treechildren[alternatingbackground="true"]::-moz-tree-cell-text(odd, selected) {
#ifdef MOZ_WIDGET_GTK2
color: -moz-gtk2-activetext;
#else
color: -moz-DialogText;
#endif
}
treechildren[alternatingbackground="true"]::-moz-tree-row(odd, selected, focus) {

4
themes/classic/jar.mn
Просмотреть файл

@ -249,7 +249,7 @@ classic.jar:
skin/classic/global/formatting.css (global/win/formatting.css)
skin/classic/global/groupbox.css (global/win/groupbox.css)
skin/classic/global/linkTree.css (global/win/linkTree.css)
* skin/classic/global/listbox.css (global/win/listbox.css)
skin/classic/global/listbox.css (global/win/listbox.css)
skin/classic/global/menulist.css (global/win/menulist.css)
skin/classic/global/popup.css (global/win/popup.css)
skin/classic/global/progressmeter.css (global/win/progressmeter.css)
@ -259,7 +259,7 @@ classic.jar:
skin/classic/global/splitter.css (global/win/splitter.css)
skin/classic/global/tabbox.css (global/win/tabbox.css)
skin/classic/global/textbox.css (global/win/textbox.css)
* skin/classic/global/tree.css (global/win/tree.css)
skin/classic/global/tree.css (global/win/tree.css)
skin/classic/global/wizard.css (global/win/wizard.css)
* skin/classic/global/menu.css (global/win/menu.css)
skin/classic/global/toolbar.css (global/win/toolbar.css)

2
toolkit/themes/gnomestripe/global/jar.mn
Просмотреть файл

@ -7,6 +7,4 @@ classic.jar:
+ skin/classic/global/button.css
+ skin/classic/global/checkbox.css
+ skin/classic/global/radio.css
+ skin/classic/global/tree.css
+ skin/classic/global/listbox.css
+ skin/classic/global/global.css

0
toolkit/themes/gnomestripe/global/listbox.css
Просмотреть файл

0
toolkit/themes/gnomestripe/global/tree.css
Просмотреть файл

6
widget/public/nsILookAndFeel.h
Просмотреть файл

@ -120,10 +120,8 @@ public:
eColor__moz_mac_menushadow, //colour used to do shadows on menu items
eColor__moz_mac_menutextselect, //colour used to display text while mouse is over a menu item
//colour needed by GTK2 skin
eColor__moz_gtk2_active, //colour used for cell text background, selected not focus
eColor__moz_gtk2_activetext, //colour used for cell text, selected not focus
eColor__moz_gtk2_hovertext, //colour used for text, hover
//colour needed by GTK2 Classic skin
eColor__moz_gtk2_hovertext,
//all of the accent colours
eColor__moz_mac_accentlightesthighlight,

13
widget/src/gtk2/nsLookAndFeel.cpp
Просмотреть файл

@ -154,11 +154,11 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor& aColor)
break;
case eColor_highlight:
// background of selected item
aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_SELECTED]);
aColor = GDK_COLOR_TO_NS_RGB(mStyle->bg[GTK_STATE_SELECTED]);
break;
case eColor_highlighttext:
// text of selected item
aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_SELECTED]);
aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_SELECTED]);
break;
case eColor_inactiveborder:
// inactive window border
@ -259,16 +259,7 @@ nsresult nsLookAndFeel::NativeGetColor(const nsColorID aID, nscolor& aColor)
// default button border color
aColor = GDK_COLOR_TO_NS_RGB(mStyle->black);
break;
case eColor__moz_gtk2_active:
// cell text background color, selected not focus
aColor = GDK_COLOR_TO_NS_RGB(mStyle->base[GTK_STATE_ACTIVE]);
break;
case eColor__moz_gtk2_activetext:
// cell text color, selected not focus
aColor = GDK_COLOR_TO_NS_RGB(mStyle->text[GTK_STATE_ACTIVE]);
break;
case eColor__moz_gtk2_hovertext:
// hover text color
aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_PRELIGHT]);
break;
default: