Bug 237535 prelight text invisible in high-contrast inverse themes

r=bryner, sr=roc, patch by ginn.chen@sun.com
This commit is contained in:
kyle.yuan%sun.com 2004-06-01 01:58:10 +00:00
Родитель 1422fe45d0
Коммит bbf295c519
19 изменённых файлов: 72 добавлений и 1360 удалений

Просмотреть файл

@ -1,748 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* 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.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998-1999
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Joe Hewitt (hewitt@netscape.com)
* Jason Kersey (kerz@netscape.com)
* Pierre Chanial (chanial@noos.fr)
* Dean Tessman (dean_tessman@hotmail.com)
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@import url("chrome://global/skin/");
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
#PersonalToolbar {
min-height: 26px;
}
/* ::::: bookmark buttons ::::: */
toolbarbutton.bookmark-item {
margin: 0;
min-width: 0;
max-width: 13em;
padding: 2px 3px;
color: -moz-DialogText !important;
}
toolbarbutton.bookmark-item:hover:active,
toolbarbutton.bookmark-item[open="true"] {
padding: 3px 2px 1px 4px;
}
.bookmark-item > .toolbarbutton-icon {
width: 16px;
height: 16px;
}
/* Prevent [mode="icons"] from hiding the label */
.bookmark-item > .toolbarbutton-text {
display: -moz-box !important;
}
.bookmark-item > .toolbarbutton-menu-dropmarker {
display: none;
}
.toolbarpaletteitem-box[type="bookmarks-toolbar"][place="palette"] {
width: 32px;
height: 32px;
background: url("chrome://browser/skin/Bookmarks-folder.png") no-repeat;
}
.bookmarks-toolbar-customize {
display: none;
max-width: 15em !important;
}
toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-customize {
display: -moz-box;
}
toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-overflow-items {
visibility: hidden;
}
toolbarpaletteitem[place="toolbar"] .bookmarks-toolbar-items {
visibility: hidden;
}
/* ::::: bookmark menus ::::: */
menu.bookmark-item,
menuitem.bookmark-item {
min-width: 0;
max-width: 26em;
border-top: 1px solid transparent !important;
border-bottom: 1px solid transparent !important;
padding: 1px 3px 1px 2px;
margin-top: -1px;
}
.bookmark-item > .menu-iconic-left > .menu-iconic-icon {
width: 16px;
height: 16px;
}
/* ..... drag and drop styles ..... */
.bookmark-item[dragover-left="true"] {
-moz-border-left-colors: #000000;
}
.bookmark-item[dragover-right="true"] {
-moz-border-right-colors: #000000;
}
.bookmark-item[dragover-top="true"] {
-moz-border-top-colors: #000000;
}
.bookmark-item[dragover-bottom="true"] {
-moz-border-bottom-colors: #000000;
}
/* ::::: bookmark items ::::: */
.bookmark-item {
list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
-moz-image-region: rect(0px, 16px, 16px, 0px)
}
.bookmark-item[container="true"] {
-moz-image-region: rect(0px, 32px, 16px, 16px) !important;
}
.bookmark-item[open="true"],
.bookmark-item[container="true"][open="true"] {
-moz-image-region: rect(16px, 32px, 32px, 16px) !important;
}
/* ::::: primary toolbar buttons ::::: */
.toolbarbutton-1 {
-moz-box-orient: vertical;
min-width: 0px;
list-style-image: url("chrome://browser/skin/Toolbar.png");
}
toolbarbutton:not([disabled="true"]):hover,
menubutton:not([disabled="true"]):hover,
toolbarbutton:not([disabled="true"]):hover:active,
menubutton:not([disabled="true"]):hover:active {
color: ButtonText !important;
}
.toolbarbutton-menubutton-stack,
.toolbarbutton-menubutton-button,
.toolbarbutton-menubutton-stack:hover,
.toolbarbutton-menubutton-button:hover,
.toolbarbutton-menubutton-stack:hover:active,
.toolbarbutton-menubutton-button:hover:active {
margin: 0 !important;
display: -moz-box;
}
toolbar[mode="icons"] .toolbarbutton-text {
display: none;
}
toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker,
toolbar[mode="text"] .toolbarbutton-icon {
display: none;
}
toolbar[mode="text"] .toolbarbutton-text {
padding: 0 !important;
margin: 3px 5px !important;
}
#back-button {
-moz-binding: url("chrome://browser/skin/browser.xml#toolbar-menu-button");
-moz-image-region: rect(0px 30px 30px 0px);
}
#back-button[buttonover="true"] {
-moz-image-region: rect(30px 30px 60px 0px);
}
#back-button[disabled="true"] {
-moz-image-region: rect(60px 30px 90px 0px);
}
#forward-button {
-moz-binding: url("chrome://browser/skin/browser.xml#toolbar-menu-button");
-moz-image-region: rect(0px 60px 30px 30px);
}
#forward-button[buttonover="true"] {
-moz-image-region: rect(30px 60px 60px 30px);
}
#forward-button[disabled="true"] {
-moz-image-region: rect(60px 60px 90px 30px) !important;
}
#reload-button {
-moz-image-region: rect(0px 120px 30px 90px);
}
#reload-button:hover {
-moz-image-region: rect(30px 120px 60px 90px);
}
#reload-button[disabled="true"] {
-moz-image-region: rect(60px 120px 90px 90px) !important;
}
#stop-button {
-moz-image-region: rect(0px 90px 30px 60px);
}
#stop-button:hover {
-moz-image-region: rect(30px 90px 60px 60px);
}
#stop-button[disabled="true"] {
-moz-image-region: rect(60px 90px 90px 60px) !important;
}
#home-button {
-moz-image-region: rect(0px 150px 30px 120px);
}
#home-button:hover {
-moz-image-region: rect(30px 150px 60px 120px);
}
#home-button[disabled="true"] {
-moz-image-region: rect(60px 150px 90px 120px) !important;
}
#print-button {
-moz-image-region: rect(0px 270px 30px 240px);
}
#print-button:hover {
-moz-image-region: rect(30px 270px 60px 240px);
}
#print-button[disabled="true"] {
-moz-image-region: rect(60px 270px 90px 240px);
}
#new-tab-button {
-moz-image-region: rect(0px 300px 30px 270px);
}
#new-tab-button:hover,
#new-tab-button[checked="true"] {
-moz-image-region: rect(30px 300px 60px 270px);
}
#new-tab-button[disabled="true"] {
-moz-image-region: rect(60px 300px 90px 270px);
}
#new-window-button {
-moz-image-region: rect(0px 330px 30px 300px);
}
#new-window-button:hover,
#new-window-button[checked="true"] {
-moz-image-region: rect(30px 330px 60px 300px);
}
#new-window-button[disabled="true"] {
-moz-image-region: rect(60px 330px 90px 300px);
}
#downloads-button {
-moz-image-region: rect(0px 180px 30px 150px);
}
#downloads-button:hover,
#downloads-button[checked="true"] {
-moz-image-region: rect(30px 180px 60px 150px);
}
#downloads-button[disabled="true"] {
-moz-image-region: rect(60px 180px 90px 150px);
}
#bookmarks-button {
-moz-image-region: rect(0px 240px 30px 210px);
}
#bookmarks-button:hover,
#bookmarks-button[checked="true"] {
-moz-image-region: rect(30px 240px 60px 210px);
}
#bookmarks-button[disabled="true"] {
-moz-image-region: rect(60px 240px 90px 210px);
}
#history-button {
-moz-image-region: rect(0px 210px 30px 180px);
}
#history-button:hover,
#history-button[checked="true"] {
-moz-image-region: rect(30px 210px 60px 180px);
}
#history-button[disabled="true"] {
-moz-image-region: rect(60px 210px 90px 180px);
}
#cut-button {
-moz-image-region: rect(0px 360px 30px 330px);
}
#cut-button:hover,
#cut-button[checked="true"] {
-moz-image-region: rect(30px 360px 60px 330px);
}
#cut-button[disabled="true"] {
-moz-image-region: rect(60px 360px 90px 330px);
}
#copy-button {
-moz-image-region: rect(0px 390px 30px 360px);
}
#copy-button:hover,
#copy-button[checked="true"] {
-moz-image-region: rect(30px 390px 60px 360px);
}
#copy-button[disabled="true"] {
-moz-image-region: rect(60px 390px 90px 360px);
}
#paste-button {
-moz-image-region: rect(0px 420px 30px 390px);
}
#paste-button:hover,
#paste-button[checked="true"] {
-moz-image-region: rect(30px 420px 60px 390px);
}
#paste-button[disabled="true"] {
-moz-image-region: rect(60px 420px 90px 390px);
}
#mail-button {
-moz-image-region: rect(0px 450px 30px 420px);
}
#mail-button:hover,
#mail-button[checked="true"] {
-moz-image-region: rect(30px 450px 60px 420px);
}
#mail-button[disabled="true"] {
-moz-image-region: rect(60px 450px 90px 420px);
}
/* ::::: small primary toolbar buttons ::::: */
toolbar[iconsize="small"] .toolbarbutton-1 {
list-style-image: url("chrome://browser/skin/Toolbar-small.png");
}
toolbar[iconsize="small"] #back-button {
-moz-image-region: rect(0px 20px 20px 0px);
}
toolbar[iconsize="small"] #back-button[buttonover="true"] {
-moz-image-region: rect(20px 20px 40px 0px);
}
toolbar[iconsize="small"] #back-button[disabled="true"] {
-moz-image-region: rect(40px 20px 60px 0px);
}
toolbar[iconsize="small"] #forward-button {
-moz-image-region: rect(0px 40px 20px 20px);
}
toolbar[iconsize="small"] #forward-button[buttonover="true"] {
-moz-image-region: rect(20px 40px 40px 20px);
}
toolbar[iconsize="small"] #forward-button[disabled="true"] {
-moz-image-region: rect(40px 40px 60px 20px) !important;
}
toolbar[iconsize="small"] #reload-button {
-moz-image-region: rect(0px 80px 20px 60px);
}
toolbar[iconsize="small"] #reload-button:hover {
-moz-image-region: rect(20px 80px 40px 60px);
}
toolbar[iconsize="small"] #reload-button[disabled="true"] {
-moz-image-region: rect(40px 80px 60px 60px) !important;
}
toolbar[iconsize="small"] #stop-button {
-moz-image-region: rect(0px 60px 20px 40px);
}
toolbar[iconsize="small"] #stop-button:hover {
-moz-image-region: rect(20px 60px 40px 40px);
}
toolbar[iconsize="small"] #stop-button[disabled="true"] {
-moz-image-region: rect(40px 60px 60px 40px) !important;
}
toolbar[iconsize="small"] #home-button {
-moz-image-region: rect(0px 100px 20px 80px);
}
toolbar[iconsize="small"] #home-button:hover {
-moz-image-region: rect(20px 100px 40px 80px);
}
toolbar[iconsize="small"] #print-button {
-moz-image-region: rect(0px 180px 20px 160px);
}
toolbar[iconsize="small"] #print-button:hover {
-moz-image-region: rect(20px 180px 40px 160px);
}
toolbar[iconsize="small"] #print-button[disabled="true"] {
-moz-image-region: rect(40px 180px 60px 160px);
}
toolbar[iconsize="small"] #downloads-button {
-moz-image-region: rect(0px 120px 20px 100px);
}
toolbar[iconsize="small"] #downloads-button:hover,
toolbar[iconsize="small"] #downloads-button[checked="true"] {
-moz-image-region: rect(20px 120px 40px 100px);
}
toolbar[iconsize="small"] #downloads-button[disabled="true"] {
-moz-image-region: rect(40px 120px 60px 100px) !important;
}
toolbar[iconsize="small"] #new-tab-button {
-moz-image-region: rect(0px 200px 20px 180px);
}
toolbar[iconsize="small"] #new-tab-button:hover,
toolbar[iconsize="small"] #new-tab-button[checked="true"] {
-moz-image-region: rect(20px 200px 40px 180px);
}
toolbar[iconsize="small"] #new-tab-button[disabled="true"] {
-moz-image-region: rect(40px 200px 60px 180px) !important;
}
toolbar[iconsize="small"] #new-window-button {
-moz-image-region: rect(0px 220px 20px 200px);
}
toolbar[iconsize="small"] #new-window-button:hover,
toolbar[iconsize="small"] #new-window-button[checked="true"] {
-moz-image-region: rect(20px 220px 40px 200px);
}
toolbar[iconsize="small"] #new-window-button[disabled="true"] {
-moz-image-region: rect(40px 220px 60px 200px) !important;
}
toolbar[iconsize="small"] #bookmarks-button {
-moz-image-region: rect(0px 160px 20px 140px);
}
toolbar[iconsize="small"] #bookmarks-button:hover,
toolbar[iconsize="small"] #bookmarks-button[checked="true"] {
-moz-image-region: rect(20px 160px 40px 140px);
}
toolbar[iconsize="small"] #bookmarks-button[disabled="true"] {
-moz-image-region: rect(40px 160px 60px 140px) !important;
}
toolbar[iconsize="small"] #history-button {
-moz-image-region: rect(0px 140px 20px 120px);
}
toolbar[iconsize="small"] #history-button:hover,
toolbar[iconsize="small"] #history-button[checked="true"] {
-moz-image-region: rect(20px 140px 40px 120px);
}
toolbar[iconsize="small"] #history-button[disabled="true"] {
-moz-image-region: rect(40px 140px 60px 120px) !important;
}
toolbar[iconsize="small"] #cut-button {
-moz-image-region: rect(0px 240px 20px 220px);
}
toolbar[iconsize="small"] #cut-button:hover,
toolbar[iconsize="small"] #cut-button[checked="true"] {
-moz-image-region: rect(20px 240px 40px 220px);
}
toolbar[iconsize="small"] #cut-button[disabled="true"] {
-moz-image-region: rect(40px 240px 60px 220px) !important;
}
toolbar[iconsize="small"] #copy-button {
-moz-image-region: rect(0px 260px 20px 240px);
}
toolbar[iconsize="small"] #copy-button:hover,
toolbar[iconsize="small"] #copy-button[checked="true"] {
-moz-image-region: rect(20px 260px 40px 240px);
}
toolbar[iconsize="small"] #copy-button[disabled="true"] {
-moz-image-region: rect(40px 260px 60px 240px) !important;
}
toolbar[iconsize="small"] #paste-button {
-moz-image-region: rect(0px 280px 20px 260px);
}
toolbar[iconsize="small"] #paste-button:hover,
toolbar[iconsize="small"] #paste-button[checked="true"] {
-moz-image-region: rect(20px 280px 40px 260px);
}
toolbar[iconsize="small"] #paste-button[disabled="true"] {
-moz-image-region: rect(40px 280px 60px 260px) !important;
}
toolbar[iconsize="small"] #mail-button {
-moz-image-region: rect(0px 300px 20px 280px);
}
toolbar[iconsize="small"] #mail-button:hover,
toolbar[iconsize="small"] #mail-button[checked="true"] {
-moz-image-region: rect(20px 300px 40px 280px);
}
toolbar[iconsize="small"] #mail-button[disabled="true"] {
-moz-image-region: rect(40px 300px 60px 280px) !important;
}
/* ::::: fullscreen window controls ::::: */
#window-controls {
-moz-box-align: center;
padding: 0 2px 0 4px;
border-left: 2px solid;
-moz-border-left-colors: ThreeDHighlight ThreeDShadow;
}
#minimize-button {
list-style-image: url("chrome://global/skin/icons/Minimize.gif");
}
#restore-button {
list-style-image: url("chrome://global/skin/icons/Restore.gif");
}
#close-button {
list-style-image: url("chrome://global/skin/icons/Close.gif");
}
/* ::::: nav-bar-inner ::::: */
#urlbar {
margin: 2px 3px;
}
#search-bar {
width: 12em;
}
/* ::::: page proxy icon ::::: */
#page-proxy-deck,
#page-proxy-favicon,
#page-proxy-button {
width: 16px;
height: 16px;
}
#page-proxy-deck {
cursor: -moz-grab;
margin: 2px 3px;
}
#page-proxy-favicon {
list-style-image: none;
}
#page-proxy-button {
list-style-image: url("chrome://global/skin/icons/folder-item.png") !important;
-moz-image-region: rect(0px, 16px, 16px, 0px);}
#page-proxy-button[pageproxystate="invalid"] {
cursor: default;
-moz-image-region: rect(16px, 16px, 32px, 0px) !important;
}
statusbarpanel#statusbar-display {
padding-left: 0;
}
/* ::::: search-bar ::::: */
#search-proxy-button {
margin-top: 2px;
margin-bottom: 1px;
}
.search-proxy-button-image {
margin: 0px;
list-style-image: url("chrome://browser/skin/Search-bar.png");
}
.search-proxy-button-dropmarker {
margin-left: 12px;
margin-top: 8px;
list-style-image: url("chrome://browser/skin/search-arrow.gif");
}
#__PhoenixFindInPage {
list-style-image: url("chrome://browser/skin/Search-bar.png");
}
/* ::::: autocomplete ::::: */
.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
color: #555566;
}
/* ::::: go button ::::: */
#go-button,
#go-container {
-moz-appearance: none;
background-color: transparent;
margin: 0;
padding: 0;
min-width: 0;
list-style-image: url("chrome://browser/skin/Go.png");
-moz-image-region: rect(0px, 20px, 20px, 0px);
}
#go-button {
-moz-appearance: toolbarbutton;
border-width: 1px !important;
-moz-border-top-colors: transparent;
-moz-border-right-colors: transparent;
-moz-border-bottom-colors: transparent;
-moz-border-left-colors: transparent;
-moz-appearance: toolbarbutton;
}
#go-button:hover {
-moz-border-top-colors: ThreeDHighlight;
-moz-border-right-colors: ThreeDShadow;
-moz-border-bottom-colors: ThreeDShadow;
-moz-border-left-colors: ThreeDHighlight;
-moz-image-region: rect(0px, 40px, 20px, 20px);
}
#go-button:hover:active {
-moz-border-top-colors: ThreeDShadow;
-moz-border-right-colors: ThreeDHighlight;
-moz-border-bottom-colors: ThreeDHighlight;
-moz-border-left-colors: ThreeDShadow;
}
#go-button[disabled="true"] {
-moz-image-region: rect(0px, 60px, 20px, 40px);
border-color: transparent;
}
#go-button > .button-box > .button-text {
margin-left: 5px !important;
}
#go-button > .button-box {
border: none;
}
#sidebar {
background-color: Window;
}
/* ::::: content area ::::: */
#status-bar {
border-top: none;
}
#security-button {
display: none;
}
#security-button[level="high"] {
list-style-image: url("chrome://browser/skin/Secure.png");
display: -moz-box;
}
#security-button[level="low"] {
list-style-image: url("chrome://browser/skin/Secure.png");
display: -moz-box;
}
#security-button[level="broken"] {
list-style-image: url("chrome://browser/skin/Security-broken.png");
display: -moz-box;
}
#page-report-button {
display: none;
}
#page-report-button[blocked] {
display: -moz-box;
list-style-image: url("chrome://browser/skin/Popup-blocked.png");
padding: 0px 3px 0px 3px;
}
#page-theme-button {
display: none;
}
#page-theme-button[themes] {
display: -moz-box;
list-style-image: url("chrome://browser/skin/page-themes.png");
padding: 0px 3px 0px 3px;
}
/* ::::: throbber ::::: */
#navigator-throbber {
-moz-appearance: none;
-moz-user-focus: ignore;
margin: 0 !important;
border: none !important;
padding: 0px !important;
min-width: 0;
background-color: transparent;
list-style-image: url("chrome://browser/skin/Throbber.png");
}
#navigator-throbber[busy="true"] {
list-style-image: url("chrome://global/skin/icons/Loading.gif");
}
.tabs-closebutton {
list-style-image: url("chrome://global/skin/icons/close-button.gif");
}
#content .tabs-closebutton {
list-style-image: url("chrome://browser/skin/Close-tab.png");
-moz-image-region: rect(0px, 14px, 14px, 0px);
}
#content .tabs-closebutton:hover {
-moz-image-region: rect(0px, 28px, 14px, 14px);
}
toolbarbutton.chevron {
list-style-image: url("chrome://global/skin/toolbar/chevron.gif") !important;
}
toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
display: none;
}
toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
display: -moz-box;
}
toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-text {
display: none;
}
#sidebar-throbber[loading="true"] {
list-style-image: url(chrome://global/skin/icons/Loading.gif);
}

Просмотреть файл

@ -108,6 +108,7 @@ 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-hovertext, _moz_gtk2_hovertext)
CSS_KEY(-moz-gujarati, _moz_gujarati)
CSS_KEY(-moz-gurmukhi, _moz_gurmukhi)
CSS_KEY(-moz-hangul-consonant, _moz_hangul_consonant)

Просмотреть файл

@ -406,6 +406,7 @@ 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_hovertext, nsILookAndFeel::eColor__moz_gtk2_hovertext,
eCSSKeyword__moz_mac_focusring, nsILookAndFeel::eColor__moz_mac_focusring,
eCSSKeyword__moz_mac_menuselect, nsILookAndFeel::eColor__moz_mac_menuselect,
eCSSKeyword__moz_mac_menushadow, nsILookAndFeel::eColor__moz_mac_menushadow,

Просмотреть файл

@ -297,11 +297,10 @@ ConvertGtkState(GtkWidgetState* state)
{
if (state->disabled)
return GTK_STATE_INSENSITIVE;
else if (state->active)
return GTK_STATE_ACTIVE;
else if (state->inHover)
return GTK_STATE_PRELIGHT;
return GTK_STATE_NORMAL;
return (state->active ? GTK_STATE_ACTIVE : GTK_STATE_PRELIGHT);
else
return GTK_STATE_NORMAL;
}
static gint
@ -789,19 +788,19 @@ moz_gtk_container_paint(GdkDrawable* drawable, GdkRectangle* rect,
style = gCheckboxWidget->style;
}
if (state_type != GTK_STATE_NORMAL && state_type != GTK_STATE_PRELIGHT)
state_type = GTK_STATE_NORMAL;
TSOffsetStyleGCs(style, rect->x, rect->y);
/* this is for drawing a prelight box */
if (state_type != GTK_STATE_NORMAL) {
gtk_paint_flat_box(style, drawable, state_type, GTK_SHADOW_ETCHED_OUT,
if (state_type == GTK_STATE_PRELIGHT || state_type == GTK_STATE_ACTIVE) {
gtk_paint_flat_box(style, drawable, GTK_STATE_PRELIGHT, GTK_SHADOW_ETCHED_OUT,
cliprect, gCheckboxWidget,
isradio ? "radiobutton" : "checkbutton",
"checkbutton",
rect->x, rect->y, rect->width, rect->height);
}
if (state_type != GTK_STATE_NORMAL && state_type != GTK_STATE_PRELIGHT)
state_type = GTK_STATE_NORMAL;
if (state->focused) {
gtk_paint_focus(style, drawable, state_type, cliprect, gCheckboxWidget,
isradio ? "radiobutton" : "checkbutton",

Просмотреть файл

@ -249,6 +249,25 @@ nsNativeThemeGTK::GetGtkWidgetAndState(PRUint8 aWidgetType, nsIFrame* aFrame,
// for dropdown textfields, look at the parent frame (the textbox)
if (aWidgetType == NS_THEME_DROPDOWN_TEXTFIELD)
aFrame = aFrame->GetParent();
// For XUL checkboxes and radio buttons, the state of the parent
// determines our state.
if (aWidgetType == NS_THEME_CHECKBOX || aWidgetType == NS_THEME_RADIO) {
if (aWidgetFlags) {
nsIAtom* atom = nsnull;
if (aFrame) {
nsIContent* content = aFrame->GetContent();
if (content->IsContentOfType(nsIContent::eXUL))
aFrame = aFrame->GetParent();
else if (content->Tag() == mInputAtom)
atom = mInputCheckedAtom;
}
if (!atom)
atom = (aWidgetType == NS_THEME_CHECKBOX) ? mCheckedAtom : mSelectedAtom;
*aWidgetFlags = CheckBooleanAttr(aFrame, atom);
}
}
PRInt32 eventState = GetContentState(aFrame);
@ -314,24 +333,6 @@ nsNativeThemeGTK::GetGtkWidgetAndState(PRUint8 aWidgetType, nsIFrame* aFrame,
break;
case NS_THEME_CHECKBOX:
case NS_THEME_RADIO:
if (aWidgetFlags) {
nsIAtom* atom = nsnull;
if (aFrame) {
// For XUL checkboxes and radio buttons, the state of the parent
// determines our state.
nsIContent* content = aFrame->GetContent();
if (content->IsContentOfType(nsIContent::eXUL))
aFrame = aFrame->GetParent();
else if (content->Tag() == mInputAtom)
atom = mInputCheckedAtom;
}
if (!atom)
atom = (aWidgetType == NS_THEME_CHECKBOX) ? mCheckedAtom : mSelectedAtom;
*aWidgetFlags = CheckBooleanAttr(aFrame, atom);
}
aGtkWidgetType = (aWidgetType == NS_THEME_RADIO) ? MOZ_GTK_RADIOBUTTON : MOZ_GTK_CHECKBUTTON;
break;
case NS_THEME_SCROLLBAR_BUTTON_UP:

Просмотреть файл

@ -108,6 +108,7 @@ 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-hovertext, _moz_gtk2_hovertext)
CSS_KEY(-moz-gujarati, _moz_gujarati)
CSS_KEY(-moz-gurmukhi, _moz_gurmukhi)
CSS_KEY(-moz-hangul-consonant, _moz_hangul_consonant)

Просмотреть файл

@ -406,6 +406,7 @@ 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_hovertext, nsILookAndFeel::eColor__moz_gtk2_hovertext,
eCSSKeyword__moz_mac_focusring, nsILookAndFeel::eColor__moz_mac_focusring,
eCSSKeyword__moz_mac_menuselect, nsILookAndFeel::eColor__moz_mac_menuselect,
eCSSKeyword__moz_mac_menushadow, nsILookAndFeel::eColor__moz_mac_menushadow,

Просмотреть файл

@ -85,6 +85,14 @@ button[default="true"] {
-moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight ThreeDLightShadow;
}
#ifdef MOZ_WIDGET_GTK2
/* .......... hover state .......... */
button:hover {
color: -moz-gtk2-hovertext;
}
#endif
/* .......... active/open/checked state .......... */
button:hover:active,
@ -94,6 +102,9 @@ button[checked="true"] {
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
-moz-border-left-colors: ThreeDDarkShadow ThreeDShadow transparent;
#ifdef MOZ_WIDGET_GTK2
color: ButtonText;
#endif
}
button:hover:active > .button-box,

Просмотреть файл

@ -96,7 +96,13 @@ checkbox[disabled="true"] {
min-height: 13px;
background: -moz-Field no-repeat 50% 50%;
}
#ifdef MOZ_WIDGET_GTK2
checkbox:hover {
color: -moz-gtk2-hovertext;
}
#endif
checkbox:hover:active > .checkbox-check {
background-color: -moz-Dialog;
}

Просмотреть файл

@ -1,6 +1,6 @@
classic.jar:
+ skin/classic/global/autocomplete.css
+ skin/classic/global/checkbox.css
+ skin/classic/global/radio.css
+ skin/classic/global/button.css
+ skin/classic/global/toolbarbutton.css
*+ skin/classic/global/checkbox.css
*+ skin/classic/global/radio.css
*+ skin/classic/global/button.css
*+ skin/classic/global/toolbarbutton.css

Просмотреть файл

@ -108,6 +108,12 @@ radio[disabled="true"] {
list-style-image: none;
}
#ifdef MOZ_WIDGET_GTK2
radio:hover {
color: -moz-gtk2-hovertext;
}
#endif
radio:hover:active > .radio-check-box1 {
background-color: -moz-Dialog;
}

Просмотреть файл

@ -75,6 +75,9 @@ toolbarbutton[buttonover="true"] {
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight;
#ifdef MOZ_WIDGET_GTK2
color: -moz-gtk2-hovertext;
#endif
}
toolbarbutton:hover:active,
@ -84,6 +87,9 @@ toolbarbutton[open="true"] {
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDHighlight;
-moz-border-left-colors: ThreeDDarkShadow ThreeDShadow;
padding: 3px 1px 1px 3px;
#ifdef MOZ_WIDGET_GTK2
color: ButtonText;
#endif
}
toolbarbutton[disabled="true"],

Просмотреть файл

@ -1,155 +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-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Joe Hewitt (hewitt@netscape.com)
*/
/* ===== button.css =====================================================
== Styles used by the XUL button element.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* :::::::::: button :::::::::: */
button {
-moz-appearance: button;
margin: 1px 5px 2px 5px;
min-width: 6.3em;
border: 3px solid;
-moz-border-top-colors: transparent ThreeDHighlight ThreeDLightShadow;
-moz-border-right-colors: transparent ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: transparent ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: transparent ThreeDHighlight ThreeDLightShadow;
background-color: ThreeDFace;
color: ButtonText;
}
.button-box {
border: 1px solid transparent;
padding: 1px 4px 2px 3px;
}
.button-text {
margin: 0 !important;
text-align: center;
}
/* .......... focused state .......... */
button:focus {
-moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight transparent;
-moz-border-right-colors: ThreeDDarkShadow ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight transparent;
}
button:focus > .button-box {
border: 1px dotted ThreeDDarkShadow;
}
/* .......... default state .......... */
button[default="true"] {
-moz-border-top-colors: ThreeDDarkShadow ThreeDHighlight ThreeDLightShadow;
-moz-border-right-colors: ThreeDDarkShadow ThreeDDarkShadow ThreeDShadow;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDDarkShadow ThreeDShadow;
-moz-border-left-colors: ThreeDDarkShadow ThreeDHighlight ThreeDLightShadow;
}
/* .......... active/open/checked state .......... */
button:hover:active,
button[open="true"],
button[checked="true"] {
-moz-border-top-colors: ThreeDDarkShadow ThreeDShadow transparent;
-moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
-moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
-moz-border-left-colors: ThreeDDarkShadow ThreeDShadow transparent;
}
button:hover:active > .button-box,
button[open="true"] > .button-box,
button[checked="true"] > .button-box {
padding: 2px 3px 1px 4px;
}
/* .......... disabled state .......... */
button[disabled="true"] {
-moz-border-top-colors: transparent ThreeDHighlight ThreeDLightShadow !important;
-moz-border-right-colors: transparent ThreeDDarkShadow ThreeDShadow !important;
-moz-border-bottom-colors: transparent ThreeDDarkShadow ThreeDShadow !important;
-moz-border-left-colors: transparent ThreeDHighlight ThreeDLightShadow !important;
color: GrayText;
}
button[disabled="true"] > .button-box {
padding: 1px 4px 2px 3px !important;
}
/* ::::: menu/menu-button buttons ::::: */
button[type="menu-button"] {
-moz-box-align: center;
-moz-box-pack: center;
margin: 0;
border: none;
}
.button-menu-dropmarker,
.button-menubutton-dropmarker {
margin: 1px;
background-image: url("chrome://global/skin/arrow/arrow-dn.gif");
min-width:11px;
min-height:11px;
}
.button-menu-dropmarker[disabled="true"],
.button-menubutton-dropmarker[disabled="true"] {
background-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
}
.button-menubutton-dropmarker[open="true"] {
margin: 2px 0px 0px 2px;
}
/* ::::: plain buttons ::::: */
button.plain {
border: 0px !important;
margin: 0px !important;
padding: 0px !important;
}
button[type="disclosure"] {
border: 0px !important;
margin: 0px !important;
padding: 0px !important;
-moz-appearance: none;
list-style-image: url("chrome://global/skin/tree/twisty-clsd.gif");
min-width: 0px !important;
background-color: transparent;
}
button[type="disclosure"][open="true"] {
list-style-image: url("chrome://global/skin/tree/twisty-open.gif");
}

Просмотреть файл

@ -1,97 +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-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*
*/
/* ===== checkbox.css ===================================================
== Styles used by the XUL checkbox element.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: checkbox ::::: */
checkbox {
-moz-appearance: checkbox-container;
-moz-box-align: center;
margin: 2px 4px;
padding: 1px 2px 1px 4px;
}
.checkbox-label-box {
margin-left: 2px;
border: 1px solid transparent;
padding: 0px 1px;
}
.checkbox-icon {
margin-right: 2px;
}
.checkbox-label {
margin: 0 !important;
}
/* ..... focused state ..... */
checkbox:focus > .checkbox-label-box {
border: 1px dotted ThreeDDarkShadow;
}
/* ..... disabled state ..... */
checkbox[disabled="true"] > .checkbox-check {
background-color: -moz-Dialog;
}
checkbox[disabled="true"] {
color: GrayText !important;
}
/* ::::: checkmark image ::::: */
.checkbox-check {
-moz-appearance: checkbox;
-moz-box-align: center;
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;
min-width: 13px;
min-height: 13px;
background: -moz-Field no-repeat 50% 50%;
}
checkbox:hover:active > .checkbox-check {
background-color: -moz-Dialog;
}
/* ..... checked state ..... */
checkbox[checked="true"] > .checkbox-check {
background-image: url("chrome://global/skin/checkbox/cbox-check.gif");
}
checkbox[checked="true"][disabled="true"] > .checkbox-check {
background-image: url("chrome://global/skin/checkbox/cbox-check-dis.gif") !important
}

Просмотреть файл

@ -1,86 +0,0 @@
classic.jar:
*+ skin/classic/global/arrow.css
*+ skin/classic/global/autocomplete.css
+ skin/classic/global/browser.css
+ skin/classic/global/checkbox.css
+ skin/classic/global/colorpicker.css
+ skin/classic/global/customizeToolbar.css
+ skin/classic/global/contents.rdf
+ skin/classic/global/dialog.css
+ skin/classic/global/formatting.css
+ skin/classic/global/global.css
+ skin/classic/global/groupbox.css
+ skin/classic/global/linkTree.css
+ skin/classic/global/listbox.css
+ skin/classic/global/menulist.css
+ skin/classic/global/popup.css
+ skin/classic/global/progressmeter.css
+ skin/classic/global/radio.css
+ skin/classic/global/scrollbars.css
+ skin/classic/global/scrollbox.css
+ skin/classic/global/spinbuttons.css
+ skin/classic/global/splitter.css
*+ skin/classic/global/tabbox.css
+ skin/classic/global/textbox.css
+ skin/classic/global/toolbarbutton.css
+ skin/classic/global/tree.css
+ skin/classic/global/wizard.css
+ skin/classic/global/button.css
+ skin/classic/global/menu.css
skin/classic/global/expander.css
+ skin/classic/global/toolbar.css
+ skin/classic/global/globalBindings.xml
+ skin/classic/global/Preview.png
+ skin/classic/global/arrow/arrow-dn-dis.gif (arrow/arrow-dn-dis.gif)
+ skin/classic/global/arrow/arrow-dn-hov.gif (arrow/arrow-dn-hov.gif)
+ skin/classic/global/arrow/arrow-dn-sharp.gif (arrow/arrow-dn-sharp.gif)
+ skin/classic/global/arrow/arrow-dn.gif (arrow/arrow-dn.gif)
+ skin/classic/global/arrow/arrow-lft-dis.gif (arrow/arrow-lft-dis.gif)
+ skin/classic/global/arrow/arrow-lft-hov.gif (arrow/arrow-lft-hov.gif)
+ skin/classic/global/arrow/arrow-lft-sharp-end.gif (arrow/arrow-lft-sharp-end.gif)
+ skin/classic/global/arrow/arrow-lft-sharp.gif (arrow/arrow-lft-sharp.gif)
+ skin/classic/global/arrow/arrow-lft.gif (arrow/arrow-lft.gif)
+ skin/classic/global/arrow/arrow-rit-dis.gif (arrow/arrow-rit-dis.gif)
+ skin/classic/global/arrow/arrow-rit-hov.gif (arrow/arrow-rit-hov.gif)
+ skin/classic/global/arrow/arrow-rit-sharp-end.gif (arrow/arrow-rit-sharp-end.gif)
+ skin/classic/global/arrow/arrow-rit-sharp.gif (arrow/arrow-rit-sharp.gif)
+ skin/classic/global/arrow/arrow-rit.gif (arrow/arrow-rit.gif)
+ skin/classic/global/arrow/arrow-up-dis.gif (arrow/arrow-up-dis.gif)
+ skin/classic/global/arrow/arrow-up-hov.gif (arrow/arrow-up-hov.gif)
+ skin/classic/global/arrow/arrow-up-sharp.gif (arrow/arrow-up-sharp.gif)
+ skin/classic/global/arrow/arrow-up.gif (arrow/arrow-up.gif)
+ skin/classic/global/checkbox/cbox-check-dis.gif (checkbox/cbox-check-dis.gif)
+ skin/classic/global/checkbox/cbox-check.gif (checkbox/cbox-check.gif)
+ skin/classic/global/icons/folder-item.png (icons/folder-item.png)
+ skin/classic/global/icons/Loading.gif (icons/Loading.gif)
+ skin/classic/global/icons/Error.png (icons/Error.png)
+ skin/classic/global/icons/Message.png (icons/Message.png)
+ skin/classic/global/icons/Question.png (icons/Question.png)
+ skin/classic/global/icons/Warning.png (icons/Warning.png)
+ skin/classic/global/icons/Minimize.gif (icons/Minimize.gif)
+ skin/classic/global/icons/Restore.gif (icons/Restore.gif)
+ skin/classic/global/icons/Close.gif (icons/Close.gif)
+ skin/classic/global/icons/close-button.gif (icons/close-button.gif)
+ skin/classic/global/menu/Menu-arrow-disabled.png (menu/Menu-arrow-disabled.png)
+ skin/classic/global/menu/Menu-arrow-hover.png (menu/Menu-arrow-hover.png)
+ skin/classic/global/menu/Menu-arrow.png (menu/Menu-arrow.png)
+ skin/classic/global/menu/menu-check-disabled.gif (menu/menu-check-disabled.gif)
+ skin/classic/global/menu/menu-check-hover.gif (menu/menu-check-hover.gif)
+ skin/classic/global/menu/menu-check.gif (menu/menu-check.gif)
+ skin/classic/global/menu/menu-radio-disabled.gif (menu/menu-radio-disabled.gif)
+ skin/classic/global/menu/menu-radio-hover.gif (menu/menu-radio-hover.gif)
+ skin/classic/global/menu/menu-radio.gif (menu/menu-radio.gif)
+ skin/classic/global/progressmeter/progressmeter-busy.gif (progressmeter/progressmeter-busy.gif)
+ skin/classic/global/radio/radio-check-dis.gif (radio/radio-check-dis.gif)
+ skin/classic/global/radio/radio-check.gif (radio/radio-check.gif)
+ skin/classic/global/scrollbar/slider.gif (scrollbar/slider.gif)
+ skin/classic/global/toolbar/Flex.png (toolbar/Flex.png)
+ skin/classic/global/toolbar/Lighten.png (toolbar/Lighten.png)
+ skin/classic/global/toolbar/chevron.gif (toolbar/chevron.gif)
+ skin/classic/global/toolbar/spacer-lft.gif (toolbar/spacer-lft.gif)
+ skin/classic/global/toolbar/spacer-rit.gif (toolbar/spacer-rit.gif)
+ skin/classic/global/tree/columnpicker.gif (tree/columnpicker.gif)
+ skin/classic/global/tree/sort-asc.gif (tree/sort-asc.gif)
+ skin/classic/global/tree/sort-dsc.gif (tree/sort-dsc.gif)
+ skin/classic/global/tree/twisty-clsd.gif (tree/twisty-clsd.gif)
+ skin/classic/global/tree/twisty-open.gif (tree/twisty-open.gif)

Просмотреть файл

@ -1,108 +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-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
*
*/
/* ===== radio.css ===================================================
== Styles used by the XUL radio element.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: radio ::::: */
radio {
-moz-appearance: radio-container;
-moz-box-align: center;
margin: 2px 4px;
padding: 1px 2px 1px 4px;
}
.radio-label-box {
margin-left: 2px;
border: 1px solid transparent;
padding: 0px 0px 1px 1px;
}
.radio-icon {
margin-right: 2px;
}
.radio-label {
margin: 0 !important;
}
/* ..... focused state ..... */
radio[focused="true"] > .radio-label-box {
border: 1px dotted ThreeDDarkShadow;
}
/* ..... disabled state ..... */
radio[disabled="true"] > .radio-check-box1 {
background-color: -moz-Dialog;
}
radio[disabled="true"] {
color: GrayText !important;
}
/* ::::: checkmark image ::::: */
.radio-check-box1 {
-moz-appearance: radio;
margin: 1px 0px;
border-top: 1px solid ThreeDShadow;
border-right: 1px solid ThreeDHighlight;
border-bottom: 1px solid ThreeDHighlight;
border-left: 1px solid ThreeDShadow;
-moz-border-radius: 50%;
width: 12px;
height: 12px;
background-color: -moz-Field;
}
.radio-check-box2 {
border-top: 1px solid ThreeDDarkShadow;
border-right: 1px solid ThreeDLightShadow;
border-bottom: 1px solid ThreeDLightShadow;
border-left: 1px solid ThreeDDarkShadow;
-moz-border-radius: 50%;
padding: 2px;
width: 4px;
height: 4px;
list-style-image: none;
}
radio:hover:active > .radio-check-box1 {
background-color: -moz-Dialog;
}
/* ..... selected state ..... */
radio[selected="true"] > .radio-check-box1 > .radio-check-box2 {
list-style-image: url("chrome://global/skin/radio/radio-check.gif");
}
radio[selected="true"][disabled="true"] > .radio-check-box1 > .radio-check-box2 {
list-style-image: url("chrome://global/skin/radio/radio-check-dis.gif") !important
}

Просмотреть файл

@ -1,133 +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-1999 Netscape Communications Corporation. All
* Rights Reserved.
*
* Contributor(s):
* Joe Hewitt (hewitt@netscape.com)
*/
/* ===== toolbarbutton.css =====================================================
== Styles used by the XUL button element.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: toolbarbutton ::::: */
toolbarbutton {
-moz-appearance: toolbarbutton;
-moz-box-align: center;
-moz-box-pack: center;
margin: 0;
border: 1px solid transparent;
padding: 4px;
background-color: transparent;
color: -moz-DialogText;
}
.toolbarbutton-icon {
margin-right: 2px;
}
.toolbarbutton-text {
margin: 0 !important;
text-align: center;
}
toolbarbutton:hover,
toolbarbutton[buttonover="true"] {
border-color: ThreeDHighlight ThreeDShadow ThreeDShadow ThreeDHighlight;
}
toolbarbutton:hover:active,
toolbarbutton[open="true"] {
border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow;
padding: 5px 3px 3px 5px;
}
toolbarbutton[disabled="true"],
toolbarbutton[disabled="true"]:hover,
toolbarbutton[disabled="true"]:hover:active,
toolbarbutton[disabled="true"][open="true"] {
border-color: transparent;
padding: 4px;
color: GrayText;
}
/* ..... checked state ..... */
toolbarbutton[checked="true"] {
border-color: ThreeDShadow ThreeDHighlight ThreeDHighlight ThreeDShadow !important;
padding: 5px 3px 3px 5px !important;
background-image: url("chrome://global/skin/toolbar/Lighten.png");
color: ButtonText !important;
}
/* ::::: toolbarbutton menu ::::: */
.toolbarbutton-menu-dropmarker {
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.toolbarbutton-menu-dropmarker[disabled="true"] {
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif");
}
/* ::::: toolbarbutton menu-button ::::: */
toolbarbutton[type="menu-button"] {
-moz-box-align: stretch;
-moz-box-orient: horizontal !important;
}
toolbarbutton[type="menu-button"],
toolbarbutton[type="menu-button"]:hover,
toolbarbutton[type="menu-button"]:hover:active,
toolbarbutton[type="menu-button"][open="true"],
toolbarbutton[type="menu-button"][disabled="true"],
toolbarbutton[type="menu-button"][disabled="true"]:hover,
toolbarbutton[type="menu-button"][disabled="true"]:hover:active {
border-style: none;
padding: 0;
}
.toolbarbutton-menubutton-button {
-moz-box-align: center;
-moz-box-pack: center;
-moz-box-orient: vertical;
}
/* .......... dropmarker .......... */
.toolbarbutton-menubutton-dropmarker {
-moz-box-align: center;
padding: 0 0 1px 0;
list-style-image: url("chrome://global/skin/arrow/arrow-dn.gif");
-moz-image-region: auto; /* cut off inheritance */
}
.toolbarbutton-menubutton-dropmarker[disabled="true"] {
padding: 0 0 1px 0 !important;
list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.gif") !important;
}
toolbarbutton[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker,
toolbarbutton[type="menu-button"][buttondown="true"] > .toolbarbutton-menubutton-dropmarker {
padding: 1px 0 0 0;
}

Просмотреть файл

@ -119,6 +119,9 @@ public:
eColor__moz_mac_menuselect, //colour used when mouse is over a menu item
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 Classic skin
eColor__moz_gtk2_hovertext,
//all of the accent colours
eColor__moz_mac_accentlightesthighlight,

Просмотреть файл

@ -259,6 +259,9 @@ 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_hovertext:
aColor = GDK_COLOR_TO_NS_RGB(mStyle->fg[GTK_STATE_PRELIGHT]);
break;
default:
/* default color is BLACK */
aColor = 0;