mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.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
Родитель df10c1763e
Коммит bb45fcc626
12 изменённых файлов: 6 добавлений и 500 удалений
Показать статистику Скачать 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

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

@ -1,152 +0,0 @@
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-2001 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Joe Hewitt (hewitt@netscape.com)
*/
/* ===== listbox.css =======================================================
== Styles used by XUL listbox-related elements.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: listbox ::::: */
listbox {
-moz-appearance: listbox;
margin: 2px 4px;
border: 2px solid;
-moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
background-color: -moz-Field;
color: -moz-FieldText;
}
/* ::::: listitem ::::: */
listitem {
border: 1px solid transparent;
}
listbox:focus > listitem[selected="true"][current="true"] {
border: 1px dotted #F5DB95;
}
listitem[selected="true"] {
background-color: -moz-gtk2-active;
color: -moz-gtk2-activetext;
}
listbox:focus > listitem[selected="true"] {
background-color: Highlight;
color: HighlightText;
}
/* ::::: listheader ::::: */
listheader {
-moz-appearance: treeheadercell;
-moz-box-align: center;
border: 2px solid;
-moz-border-top-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDHighlight ThreeDLightShadow;
background-color: -moz-Dialog;
color: -moz-DialogText;
padding: 0 4px;
}
listheader[sortable="true"]:hover:active {
border-top: 2px solid;
border-right: 1px solid;
border-bottom: 1px solid;
border-left: 2px solid;
-moz-border-top-colors: ThreeDShadow -moz-Dialog;
-moz-border-right-colors: ThreeDShadow;
-moz-border-bottom-colors: ThreeDShadow;
-moz-border-left-colors: ThreeDShadow -moz-Dialog;
padding: 1px 4px 0 5px;
}
.listheader-icon {
margin-right: 2px;
}
.listheader-label {
margin: 0px !important;
}
/* ..... sort direction icon ..... */
.listheader-sortdirection {
list-style-image: none;
}
.listheader-sortdirection[sortDirection="ascending"] {
list-style-image: url("chrome://global/skin/tree/sort-asc.gif");
}
.listheader-sortdirection[sortDirection="descending"] {
list-style-image: url("chrome://global/skin/tree/sort-dsc.gif");
}
/* ::::: listcell ::::: */
.listcell-label {
margin: 0px !important;
padding: 0px 0px 1px 4px;
white-space: nowrap;
}
.listcell-icon {
margin-right: 2px;
}
.listcell-label[disabled="true"] {
color: GrayText;
}
/* ::::: listcell checkbox ::::: */
.listcell-check {
-moz-appearance: checkbox;
-moz-box-align: center;
margin: 0px 2px;
border: 1px solid -moz-DialogText;
min-width: 13px;
min-height: 13px;
background: -moz-Field no-repeat 50% 50%;
}
.listcell-check[checked="true"] {
background-image: url("chrome://global/skin/checkbox/cbox-check.gif");
}
.listcell-check[disabled="true"] {
border-color: GrayText;
background-image: url("chrome://global/skin/checkbox/cbox-dis.gif");
}
.listcell-check[disabled="true"][checked="true"] {
background-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif");
}

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

@ -1,295 +0,0 @@
/*
* The contents of this file are subject to the Netscape Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/NPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is Mozilla Communicator client code, released
* March 31, 1998.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 1998-2001 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Joe Hewitt (hewitt@netscape.com)
*/
/* ===== tree.css ===================================================
== Styles used by the XUL outline element.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: tree ::::: */
tree {
margin: 0px 4px;
border: 2px solid;
-moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-moz-border-right-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-bottom-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
background-color: -moz-Field;
color: -moz-FieldText;
-moz-appearance: listbox;
}
/* ::::: tree rows ::::: */
treechildren::-moz-tree-row {
border: 1px solid transparent;
min-height: 18px;
height: 1.3em;
}
treechildren::-moz-tree-row(selected) {
background-color: -moz-gtk2-active;
}
treechildren::-moz-tree-row(selected, focus) {
background-color: Highlight;
}
treechildren::-moz-tree-row(current, focus) {
border: 1px dotted #F5DB95;
}
/* ::::: tree cells ::::: */
treechildren::-moz-tree-cell {
padding: 0px 2px 0px 2px;
}
treechildren::-moz-tree-cell-text {
color: inherit;
}
treechildren::-moz-tree-cell-text(selected) {
color: -moz-gtk2-activetext;
}
treechildren::-moz-tree-cell-text(selected, focus) {
color: HighlightText;
}
/* ::::: lines connecting cells ::::: */
treechildren::-moz-tree-line {
border: 1px dotted ThreeDShadow;
}
treechildren::-moz-tree-line(selected, focus) {
border: 1px dotted HighlightText;
}
/* ::::: tree separator ::::: */
treechildren::-moz-tree-separator {
border-top: 1px solid ThreeDShadow;
border-bottom: 1px solid ThreeDHighlight;
}
/* ::::: drop feedback ::::: */
treechildren::-moz-tree-cell-text(primary, dropOn) {
background-color: Highlight;
color: HighlightText;
}
treechildren::-moz-tree-drop-feedback {
background-color: Highlight;
width: 50px;
height: 2px;
margin-left: 5px;
}
/* ::::: tree progress meter ::::: */
treechildren::-moz-tree-progressmeter {
margin: 2px 4px;
border: 2px solid;
-moz-border-top-colors: ThreeDShadow -moz-Dialog;
-moz-border-right-colors: ThreeDHighlight -moz-Dialog;
-moz-border-bottom-colors: ThreeDHighlight -moz-Dialog;
-moz-border-left-colors: ThreeDShadow -moz-Dialog;
background-color: -moz-Dialog;
color: ThreeDShadow;
}
treechildren::-moz-tree-progressmeter(progressUndetermined) {
list-style-image: url("chrome://global/skin/progressmeter/progressmeter-busy.gif");
}
treechildren::-moz-tree-cell-text(progressmeter) {
margin: 2px 4px;
}
/* ::::: tree columns ::::: */
treecol,
treecolpicker {
-moz-appearance: treeheadercell;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
-moz-border-top-colors: ThreeDHighlight ThreeDLightShadow;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDHighlight ThreeDLightShadow;
background-color: -moz-Dialog;
color: -moz-DialogText;
padding: 0px 4px;
}
.treecol-image {
padding: 0px 1px;
}
.treecol-text {
margin: 0px !important;
}
treecol[hideheader="true"] {
-moz-appearance: none;
border: none;
padding: 0;
}
/* ..... internal box ..... */
treecol:hover:active,
treecolpicker:hover:active {
border-top: 2px solid;
border-right: 1px solid;
border-bottom: 1px solid;
border-left: 2px solid;
-moz-border-top-colors: ThreeDShadow -moz-Dialog;
-moz-border-right-colors: ThreeDShadow;
-moz-border-bottom-colors: ThreeDShadow;
-moz-border-left-colors: ThreeDShadow -moz-Dialog;
padding: 1px 4px 0px 5px;
}
.treecol-image:hover:active {
padding: 1px 1px 0px 2px;
}
/* ::::: column drag and drop styles ::::: */
treecol[dragging="true"] {
-moz-border-top-colors: ThreeDDarkShadow transparent !important;
-moz-border-right-colors: ThreeDDarkShadow transparent!important;
-moz-border-bottom-colors: ThreeDDarkShadow transparent !important;
-moz-border-left-colors: ThreeDDarkShadow transparent !important;
background-color: ThreeDShadow !important;
color: ThreeDHighlight !important;
}
treecol[insertafter="true"] {
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
}
treecol[insertbefore="true"] {
-moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
}
treechildren::-moz-tree-column(insertbefore) {
border-left: 1px solid ThreeDShadow;
}
treechildren::-moz-tree-column(insertafter) {
border-right: 1px solid ThreeDShadow;
}
/* ::::: sort direction indicator ::::: */
.treecol-sortdirection {
list-style-image: none;
}
treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="ascending"] {
list-style-image: url("chrome://global/skin/tree/sort-asc.gif");
}
treecol:not([hideheader="true"]) > .treecol-sortdirection[sortDirection="descending"] {
list-style-image: url("chrome://global/skin/tree/sort-dsc.gif");
}
/* ::::: column picker ::::: */
.tree-columnpicker-icon {
list-style-image: url("chrome://global/skin/tree/columnpicker.gif");
}
/* ::::: twisty ::::: */
treechildren::-moz-tree-twisty {
padding-right: 4px;
padding-top: 1px;
width: 9px; /* The image's width is 9 pixels */
list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
}
treechildren::-moz-tree-twisty(open) {
width: 9px; /* The image's width is 9 pixels */
list-style-image: url("chrome://global/skin/tree/twisty-open.png");
}
treechildren::-moz-tree-indentation {
width: 18px;
}
/* ::::: gridline style ::::: */
treechildren.gridlines::-moz-tree-cell {
border-right: 1px solid transparent !important;
border-bottom: 1px solid transparent !important;
}
treechildren.gridlines::-moz-tree-row {
border: none;
}
treechildren::-moz-tree-image(Name) {
padding-right: 2px;
}
treechildren::-moz-tree-image(Name) {
margin: 0px 2px;
list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
-moz-image-region: rect(0px, 16px, 16px, 0px);
}
treechildren::-moz-tree-image(Name, container) {
-moz-image-region: rect(0px, 32px, 16px, 16px);
}
treechildren::-moz-tree-image(Name, open) {
-moz-image-region: rect(16px, 32px, 32px, 16px);
}
treechildren::-moz-tree-image(Name, separator) {
list-style-image: none;
width: 0px !important;
height: 0px !important;
margin: 0px 0px;
}
treechildren::-moz-tree-cell-text(Name, separator) {
color: ThreeDShadow;
margin: 0px 5px 0px 5px;
}
treechildren::-moz-tree-cell-text(Name, separator, selected, focus) {
color: HighlightText;
}

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: