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

nsITheme impl on mac. r=sfraser/sr=hyatt. bugs 115731, 115733, 115735, 115737, 115740, 115749, 115760, 115763

This commit is contained in:
pinkerton%netscape.com 2002-01-15 14:59:21 +00:00
Родитель 6af9069042
Коммит a799df64b7
22 изменённых файлов: 1078 добавлений и 136 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -459,7 +459,8 @@ CSS_KEY(scrollbargripper-vertical, scrollbargripper_vertical)
CSS_KEY(textfield, textfield)
CSS_KEY(caret, caret)
CSS_KEY(menulist, menulist)
CSS_KEY(menulistbutton, menulistbutton)
CSS_KEY(menulist-button, menulistbutton)
CSS_KEY(menulist-text, menulisttext)
CSS_KEY(slider, slider)
CSS_KEY(sliderthumb, sliderthumb)
CSS_KEY(sliderthumbstart, sliderthumbstart)

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

@ -177,6 +177,7 @@ const PRInt32 nsCSSProps::kAppearanceKTable[] = {
eCSSKeyword_caret, NS_THEME_TEXTFIELD_CARET,
eCSSKeyword_menulist, NS_THEME_DROPDOWN,
eCSSKeyword_menulistbutton, NS_THEME_DROPDOWN_BUTTON,
eCSSKeyword_menulisttext, NS_THEME_DROPDOWN_TEXT,
eCSSKeyword_slider, NS_THEME_SLIDER,
eCSSKeyword_sliderthumb, NS_THEME_SLIDER_THUMB,
eCSSKeyword_sliderthumbstart, NS_THEME_SLIDER_THUMB_START,

54
gfx/macbuild/gfxComponent.xml
Просмотреть файл

@ -1144,6 +1144,13 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsNativeThemeMac.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsCompressedCharMap.cpp</PATH>
@ -1341,6 +1348,11 @@
<PATH>nsMacUnicodeFontInfo.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsNativeThemeMac.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsCompressedCharMap.cpp</PATH>
@ -2452,6 +2464,13 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsNativeThemeMac.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsCompressedCharMap.cpp</PATH>
@ -2651,6 +2670,11 @@
<PATH>nsMacUnicodeFontInfo.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsNativeThemeMac.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsCompressedCharMap.cpp</PATH>
@ -3767,6 +3791,13 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsNativeThemeMac.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsCompressedCharMap.cpp</PATH>
@ -3966,6 +3997,11 @@
<PATH>nsMacUnicodeFontInfo.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsNativeThemeMac.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsCompressedCharMap.cpp</PATH>
@ -5089,6 +5125,13 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsNativeThemeMac.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Text</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsCompressedCharMap.cpp</PATH>
@ -5286,6 +5329,11 @@
<PATH>nsMacUnicodeFontInfo.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsNativeThemeMac.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsCompressedCharMap.cpp</PATH>
@ -5420,6 +5468,12 @@
<PATH>nsMacUnicodeFontInfo.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>gfxComponentDbg.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>nsNativeThemeMac.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>gfxComponentDbg.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>

3
gfx/public/nsThemeConstants.h
Просмотреть файл

@ -143,6 +143,9 @@
// The dropdown button(s) that open up a dropdown list.
#define NS_THEME_DROPDOWN_BUTTON 102
// The text part of a dropdown list, to left of button
#define NS_THEME_DROPDOWN_TEXT 103
// A slider
#define NS_THEME_SLIDER 111

8
gfx/src/mac/nsGfxFactoryMac.cpp
Просмотреть файл

@ -48,6 +48,7 @@
#include "nsDeviceContextMac.h"
#include "nsRegionMac.h"
#include "nsScriptableRegion.h"
#include "nsNativeThemeMac.h"
#if TARGET_CARBON
#include "nsDeviceContextSpecX.h"
#include "nsPrintOptionsX.h"
@ -83,6 +84,7 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsDeviceContextSpecFactoryMac)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontEnumeratorMac)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsFontList)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsScreenManagerMac)
NS_GENERIC_FACTORY_CONSTRUCTOR(nsNativeThemeMac)
static NS_IMETHODIMP
nsScriptableRegionConstructor(nsISupports* aOuter, REFNSIID aIID, void** aResult)
@ -168,7 +170,11 @@ static nsModuleComponentInfo components[] =
{ "nsScreenManager",
NS_SCREENMANAGER_CID,
"@mozilla.org/gfx/screenmanager;1",
nsScreenManagerMacConstructor }
nsScreenManagerMacConstructor },
{ "Native Theme Renderer",
NS_THEMERENDERER_CID,
"@mozilla.org/chrome/chrome-native-theme;1",
nsNativeThemeMacConstructor }
};
PR_STATIC_CALLBACK(void)

868
gfx/src/mac/nsNativeThemeMac.cpp Normal file
Просмотреть файл

@ -0,0 +1,868 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** 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
* Mike Pinkerton (pinkerton@netscape.com)
*
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* 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 ***** */
#include <Gestalt.h>
#include "nsNativeThemeMac.h"
#include "nsRenderingContextMac.h"
#include "nsDeviceContextMac.h"
#include "nsRect.h"
#include "nsSize.h"
#include "nsTransform2D.h"
#include "nsThemeConstants.h"
#include "nsIPresShell.h"
#include "nsIPresContext.h"
#include "nsIContent.h"
#include "nsIDocument.h"
#include "nsIFrame.h"
#include "nsIEventStateManager.h"
#include "nsINameSpaceManager.h"
#include "nsIPresContext.h"
#include "nsILookAndFeel.h"
#include "nsRegionPool.h"
//
// Return true if we are on Mac OS X, caching the result after the first call
// Yes, this needs to go somehwere better.
//
static PRBool OnMacOSX()
{
static PRBool gInitVer = PR_FALSE;
static PRBool gOnMacOSX = PR_FALSE;
if(! gInitVer) {
long version;
OSErr err = ::Gestalt(gestaltSystemVersion, &version);
gOnMacOSX = (err == noErr && version >= 0x00001000);
gInitVer = PR_TRUE;
}
return gOnMacOSX;
}
static void
ConvertGeckoToNativeRect(const nsRect& aSrc, Rect& aDst)
{
aDst.top = aSrc.y;
aDst.bottom = aSrc.y + aSrc.height;
aDst.left = aSrc.x;
aDst.right = aSrc.x + aSrc.width;
}
static void
GetPrimaryPresShell(nsIFrame* aFrame, nsIPresShell** aResult)
{
*aResult = nsnull;
if (!aFrame)
return;
nsCOMPtr<nsIDocument> doc;
nsCOMPtr<nsIContent> content;
aFrame->GetContent(getter_AddRefs(content));
content->GetDocument(*getter_AddRefs(doc));
if (doc)
doc->GetShellAt(0, aResult); // Addref happens here.
}
static PRInt32
GetContentState(nsIFrame* aFrame)
{
if (!aFrame)
return 0;
nsCOMPtr<nsIPresShell> shell;
GetPrimaryPresShell(aFrame, getter_AddRefs(shell));
if (!shell)
return 0;
nsCOMPtr<nsIPresContext> context;
shell->GetPresContext(getter_AddRefs(context));
nsCOMPtr<nsIEventStateManager> esm;
context->GetEventStateManager(getter_AddRefs(esm));
PRInt32 flags = 0;
nsCOMPtr<nsIContent> content;
aFrame->GetContent(getter_AddRefs(content));
esm->GetContentState(content, flags);
return flags;
}
//
// GetAttribute
//
// Gets the given attribute from the given frame's content node
// and returns PR_TRUE if the attribute was found and PR_FALSE if
// it wasn't
//
static PRBool
GetAttribute(nsIFrame* aFrame, nsIAtom* inAttribute, nsCString& outValue)
{
if (!aFrame)
return PR_FALSE;
nsCOMPtr<nsIContent> content;
aFrame->GetContent(getter_AddRefs(content));
nsAutoString attr;
nsresult res = content->GetAttr(kNameSpaceID_None, inAttribute, attr);
outValue = NS_LossyConvertUCS2toASCII(attr).get();
return ( res != NS_CONTENT_ATTR_NO_VALUE );
}
static PRBool
HasAttrValue(nsIContent* aContent, nsIAtom* aAtom, const char* aStr)
{
nsAutoString attr;
aContent->GetAttr(kNameSpaceID_None, aAtom, attr);
return attr.EqualsIgnoreCase(aStr);
}
static PRInt32
CheckIntAttr(nsIFrame* aFrame, nsIAtom* aAtom)
{
nsCAutoString value;
if ( GetAttribute(aFrame, aAtom, value) )
return atoi(value.get());
else
return 0;
}
static PRBool
CheckBooleanAttr(nsIFrame* aFrame, nsIAtom* aAtom)
{
nsCAutoString value;
GetAttribute(aFrame, aAtom, value);
if ( GetAttribute(aFrame, aAtom, value) )
return strcmp(value.get(), "true") == 0; // This handles the XUL case.
else
return PR_TRUE; // handles the HTML case where no val is true
}
#ifdef XP_MAC
#pragma mark -
#endif
NS_IMPL_ISUPPORTS1(nsNativeThemeMac, nsITheme)
nsNativeThemeMac::nsNativeThemeMac()
{
NS_INIT_ISUPPORTS();
mCheckedAtom = do_GetAtom("checked");
mDisabledAtom = do_GetAtom("disabled");
mSelectedAtom = do_GetAtom("selected");
mDefaultAtom = do_GetAtom("default");
mValueAtom = do_GetAtom("value");
mModeAtom = do_GetAtom("mode");
mOrientAtom = do_GetAtom("orient");
mCurPosAtom = do_GetAtom("curpos");
mMaxPosAtom = do_GetAtom("maxpos");
mScrollbarAtom = do_GetAtom("scrollbar");
}
nsNativeThemeMac::~nsNativeThemeMac()
{
}
PRBool
nsNativeThemeMac::IsDisabled(nsIFrame* aFrame)
{
return CheckBooleanAttr(aFrame, mDisabledAtom);
}
PRBool
nsNativeThemeMac::IsDefaultButton(nsIFrame* aFrame)
{
return CheckBooleanAttr(aFrame, mDefaultAtom);
}
PRBool
nsNativeThemeMac::IsChecked(nsIFrame* aFrame)
{
return CheckBooleanAttr(aFrame, mCheckedAtom);
}
PRBool
nsNativeThemeMac::IsSelected(nsIFrame* aFrame)
{
return CheckBooleanAttr(aFrame, mSelectedAtom);
}
PRBool
nsNativeThemeMac::IsIndeterminate(nsIFrame* aFrame)
{
nsCAutoString mode;
if ( GetAttribute(aFrame, mModeAtom, mode) )
return strcmp(mode.get(), "undetermined") == 0;
return PR_FALSE;
}
//
// GetScrollbarParent
//
// Starting at the given frame, walk up the chain until we find the
// top-level scrollbar, computing offsets as we go. Callers will
// would subtract this offset from the scrollbar's coordinates
// to draw in the current frame's coord system.
//
nsIFrame*
nsNativeThemeMac::GetScrollbarParent(nsIFrame* inButton, nsPoint* outOffset)
{
outOffset->MoveTo(0,0);
if ( !inButton )
return nsnull;
PRBool found = PR_FALSE;
nsIFrame* currFrame = inButton;
do {
// grab the content node of this frame, check if its tag is
// |scrollbar|. If not, keep going up the chain.
nsCOMPtr<nsIContent> content;
currFrame->GetContent(getter_AddRefs(content));
nsCOMPtr<nsIAtom> tag;
content->GetTag(*getter_AddRefs(tag));
if ( tag == mScrollbarAtom )
found = PR_TRUE;
else {
// drat, add to our offset and check the parent
nsPoint offsetFromParent;
currFrame->GetOrigin(offsetFromParent);
*outOffset += offsetFromParent;
currFrame->GetParent(&currFrame);
}
} while ( !found && currFrame );
return currFrame;
}
//
// GetScrollbarParentLocalRect
//
// Given a child of a scrollbar, returns the parent scrollbar frame as
// well as the rect of the parent scrollbar offset into the coordinate
// system of the given child. A caller can turn around and pass this
// rect directly to the AppearanceManager for drawing the entire scrollbar.
//
nsIFrame*
nsNativeThemeMac::GetScrollbarParentLocalRect ( nsIFrame* inButton, nsTransform2D* inMatrix, Rect* outAdjustedRect )
{
::SetRect(outAdjustedRect, 0, 0, 0, 0);
nsPoint offset;
nsIFrame* scrollbar = GetScrollbarParent(inButton, &offset);
if ( scrollbar ) {
nsRect scrollbarRect;
scrollbar->GetRect(scrollbarRect);
nsRect localScrollRect(-offset.x, -offset.y, scrollbarRect.width, scrollbarRect.height);
// now that we have it in gecko coords, transform it to coords the OS can use
inMatrix->TransformCoord(&localScrollRect.x, &localScrollRect.y,
&localScrollRect.width, &localScrollRect.height);
ConvertGeckoToNativeRect(localScrollRect, *outAdjustedRect);
}
return scrollbar;
}
#ifdef XP_MAC
#pragma mark -
#endif
void
nsNativeThemeMac::DrawCheckboxRadio ( ThemeButtonKind inKind, const Rect& inBoxRect, PRBool inChecked,
PRBool inDisabled, PRInt32 inState )
{
ThemeButtonDrawInfo info;
if ( inDisabled )
info.state = kThemeStateInactive;
else
info.state = ((inState & NS_EVENT_STATE_ACTIVE) && (inState & NS_EVENT_STATE_HOVER)) ?
kThemeStatePressed : kThemeStateActive;
info.value = inChecked ? kThemeButtonOn : kThemeButtonOff;
info.adornment = (inState & NS_EVENT_STATE_FOCUS) ? kThemeAdornmentFocus : kThemeAdornmentNone;
::DrawThemeButton ( &inBoxRect, inKind, &info, nsnull, nsnull, nsnull, 0L );
}
void
nsNativeThemeMac::DrawCheckbox ( const Rect& inBoxRect, PRBool inChecked, PRBool inDisabled, PRInt32 inState )
{
DrawCheckboxRadio(kThemeCheckBox, inBoxRect, inChecked, inDisabled, inState);
}
void
nsNativeThemeMac::DrawRadio ( const Rect& inBoxRect, PRBool inChecked, PRBool inDisabled, PRInt32 inState )
{
DrawCheckboxRadio(kThemeRadioButton, inBoxRect, inChecked, inDisabled, inState);
}
void
nsNativeThemeMac::DrawButton ( ThemeButtonKind inKind, const Rect& inBoxRect, PRBool inIsDefault,
PRBool inDisabled, PRInt32 inState )
{
ThemeButtonDrawInfo info;
if ( inDisabled )
info.state = kThemeStateUnavailableInactive;
else
info.state = ((inState & NS_EVENT_STATE_ACTIVE) && (inState & NS_EVENT_STATE_HOVER)) ?
kThemeStatePressed : kThemeStateActive;
info.value = kThemeButtonOn;
info.adornment = kThemeAdornmentNone;
if ( inState & NS_EVENT_STATE_FOCUS )
info.adornment = kThemeAdornmentFocus;
if ( inIsDefault )
info.adornment |= kThemeAdornmentDefault;
::DrawThemeButton ( &inBoxRect, inKind, &info, nsnull, nsnull, nsnull, 0L );
}
void
nsNativeThemeMac::DrawToolbar ( const Rect& inBoxRect )
{
ThemeDrawState drawState = kThemeStateActive;
::DrawThemeWindowHeader(&inBoxRect, drawState);
}
void
nsNativeThemeMac::DrawEditText ( const Rect& inBoxRect, PRBool inIsDisabled )
{
Pattern whitePat;
::BackColor(whiteColor);
::BackPat(GetQDGlobalsWhite(&whitePat));
::EraseRect(&inBoxRect);
ThemeDrawState drawState = inIsDisabled ? kThemeStateActive : kThemeStateDisabled;
::DrawThemeEditTextFrame(&inBoxRect, drawState);
}
void
nsNativeThemeMac::DrawProgress ( const Rect& inBoxRect, PRBool inIsDisabled, PRBool inIsIndeterminate,
PRBool inIsHorizontal, PRInt32 inValue )
{
ThemeTrackDrawInfo info;
static SInt32 sPhase = 0;
info.kind = inIsIndeterminate ? kThemeMediumIndeterminateBar: kThemeMediumProgressBar;
info.bounds = inBoxRect;
info.min = 0;
info.max = 100;
info.value = inValue;
info.attributes = inIsHorizontal ? kThemeTrackHorizontal : 0L;
info.enableState = inIsDisabled ? kThemeTrackDisabled : kThemeTrackActive;
info.trackInfo.progress.phase = sPhase++; // animate for the next time we're called
::DrawThemeTrack(&info, nsnull, nsnull, 0L);
}
//
// DrawFullScrollbar
//
// Draw everything in one fell swoop. Unfortunately, the AM doesn't give
// us the ability to draw individual components. There is a routine
// called |DrawThemeScrollBarArrows|, but it's a no-op in Aqua.
//
void
nsNativeThemeMac::DrawFullScrollbar ( const Rect& inSbarRect, PRInt32 inWidgetHit, PRInt32 inLineHeight,
PRBool inIsDisabled, PRInt32 inMax, PRInt32 inValue, PRInt32 inState )
{
ThemeTrackDrawInfo info;
// the scrollbar is horizontal if the width is greater than the height. Too bad the API
// doesn't tell us which is which.
PRBool isHorizontal =
(inSbarRect.right - inSbarRect.left) > (inSbarRect.bottom - inSbarRect.top);
// compute the number of lines in our view. It's probably safe to assume that
// the height of the scrollbar is the height of the scrollable view
PRInt32 viewSize = isHorizontal ? (inSbarRect.right - inSbarRect.left) : (inSbarRect.bottom - inSbarRect.top);
viewSize /= inLineHeight;
// Figure out if something should be drawn depressed
ThemeTrackPressState pressState = 0L;
if ( (inState & NS_EVENT_STATE_ACTIVE && inState & NS_EVENT_STATE_HOVER) ) {
//printf("something is :hover:active!\n");
switch ( inWidgetHit ) {
case NS_THEME_SCROLLBAR_BUTTON_UP:
pressState = kThemeTopOutsideArrowPressed;
break;
}
}
//XXX can we draw inactive if we can determine if we're not in the topmost window?
//XXX this is true for all controls, but scrollbars are the ones you notice the most
info.kind = kThemeMediumScrollBar;
info.bounds = inSbarRect;
info.min = 0;
info.max = inMax;
info.value = inValue;
info.attributes = isHorizontal ? kThemeTrackHorizontal : 0L;
info.attributes |= kThemeTrackShowThumb;
info.enableState = kThemeTrackActive;
info.trackInfo.scrollbar.viewsize = viewSize;
info.trackInfo.scrollbar.pressState = pressState;
::DrawThemeTrack(&info, nsnull, nsnull, 0L);
#ifdef DEBUG_PINK
// some debug info for helping diagnose problems
printf("--- BEGIN scrollbar debug info\n");
if ( isHorizontal )
printf("horizontal\n");
else
printf("vertical\n");
printf("viewSize %ld\n", viewSize);
printf("max %ld\n", inMax);
printf("value %ld\n", inValue);
printf("pressState %x\n", pressState);
printf("--- END scrollbar debug info\n");
#endif
}
NS_IMETHODIMP
nsNativeThemeMac::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame* aFrame,
PRUint8 aWidgetType, const nsRect& aRect, const nsRect& aClipRect)
{
// save off the old clip rgn for later restoration. however, we're currently
// not using the cliprect because aqua likes to draw shadows and stuff outside
// the bounds we give it, and clipping to the exact rect looks horrible.
StRegionFromPool oldClip;
::GetClip(oldClip);
// transform rect coordinates to correct coord system
nsTransform2D* transformMatrix;
aContext->GetCurrentTransform(transformMatrix);
nsRect transRect(aRect), transClipRect(aClipRect);
Rect macRect, clipRect;
transformMatrix->TransformCoord(&transRect.x, &transRect.y, &transRect.width, &transRect.height);
ConvertGeckoToNativeRect(transRect, macRect);
#ifdef CLIP_DRAWING
transformMatrix->TransformCoord(&transClipRect.x, &transClipRect.y, &transClipRect.width, &transClipRect.height);
ConvertGeckoToNativeRect(transClipRect, clipRect);
::ClipRect(&clipRect);
#endif
// for some widgets, the parent determines the appropriate state. grab the parent instead.
if ( aWidgetType == NS_THEME_CHECKBOX || aWidgetType == NS_THEME_RADIO ) {
nsCOMPtr<nsIContent> content;
aFrame->GetContent(getter_AddRefs(content));
if (content->IsContentOfType(nsIContent::eXUL))
aFrame->GetParent(&aFrame);
}
PRInt32 eventState = GetContentState(aFrame);
switch ( aWidgetType ) {
case NS_THEME_CHECKBOX:
DrawCheckbox ( macRect, IsChecked(aFrame), IsDisabled(aFrame), eventState );
break;
case NS_THEME_RADIO:
DrawRadio ( macRect, IsSelected(aFrame), IsDisabled(aFrame), eventState );
break;
case NS_THEME_BUTTON:
DrawButton ( kThemePushButton, macRect, IsDefaultButton(aFrame), IsDisabled(aFrame), eventState );
break;
case NS_THEME_TOOLBAR_BUTTON:
DrawButton ( kThemePushButton, macRect, IsDefaultButton(aFrame), IsDisabled(aFrame), eventState );
break;
case NS_THEME_TOOLBAR:
case NS_THEME_TOOLBOX:
case NS_THEME_STATUSBAR:
DrawToolbar ( macRect );
break;
case NS_THEME_DROPDOWN:
DrawButton ( kThemePopupButton, macRect, IsDefaultButton(aFrame), IsDisabled(aFrame), eventState );
break;
case NS_THEME_DROPDOWN_BUTTON:
// do nothing, this is covered by the DROPDOWN case
break;
case NS_THEME_TEXTFIELD:
DrawEditText ( macRect, IsDisabled(aFrame) );
break;
case NS_THEME_PROGRESSBAR:
DrawProgress ( macRect, IsDisabled(aFrame), IsIndeterminate(aFrame), PR_TRUE, CheckIntAttr(aFrame, mValueAtom) );
break;
case NS_THEME_PROGRESSBAR_VERTICAL:
DrawProgress ( macRect, IsDisabled(aFrame), IsIndeterminate(aFrame), PR_FALSE, CheckIntAttr(aFrame, mValueAtom) );
break;
case NS_THEME_PROGRESSBAR_CHUNK:
case NS_THEME_PROGRESSBAR_CHUNK_VERTICAL:
// do nothing, covered by the progress bar cases above
break;
case NS_THEME_TREEVIEW_TWISTY:
DrawButton ( kThemeDisclosureButton, macRect, PR_FALSE, IsDisabled(aFrame), eventState );
break;
#if 0
case NS_THEME_SCROLLBAR:
break;
#endif
case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
case NS_THEME_SCROLLBAR_BUTTON_UP:
case NS_THEME_SCROLLBAR_BUTTON_DOWN:
case NS_THEME_SCROLLBAR_BUTTON_LEFT:
case NS_THEME_SCROLLBAR_BUTTON_RIGHT:
{
const PRInt32 kLineHeight = 16; // should get this from the view
// draw the thumb and the scrollbar track. In order to do that, we
// need to get the rect of the parent scrollbar (all we have now
// is the rect of the thumb) in coordinates relative to the current coord
// system. GetScrollbarParentLocalRect() will do all that for us.
Rect macScrollbarRect;
nsIFrame* scrollbar = GetScrollbarParentLocalRect(aFrame, transformMatrix, &macScrollbarRect);
if ( scrollbar ) {
// covert the scrollbar's maxpos to lines. That becomes the number of
// clicks it takes to scroll to the bottom of the document, which is what
// apperance wants for the max value of the scrollbar. Ensure that
// |maxPos| is at least 1. If there really is nothing to scroll, Gecko
// will hide the scrollbar.
PRInt32 maxPos = CheckIntAttr(scrollbar, mMaxPosAtom) / kLineHeight;
if ( !maxPos )
maxPos = 1;
PRInt32 curPos = CheckIntAttr(scrollbar, mCurPosAtom) / kLineHeight;
DrawFullScrollbar ( macScrollbarRect, aWidgetType, kLineHeight, IsDisabled(aFrame),
maxPos, curPos, eventState);
}
break;
}
}
::SetClip(oldClip);
return NS_OK;
}
#ifdef XP_MAC
#pragma mark -
#endif
NS_IMETHODIMP
nsNativeThemeMac::GetWidgetBorder(nsIDeviceContext* aContext,
nsIFrame* aFrame,
PRUint8 aWidgetType,
nsMargin* aResult)
{
aResult->SizeTo(0,0,0,0);
// XXX we should probably cache some of these metrics
switch ( aWidgetType ) {
case NS_THEME_BUTTON:
if ( OnMacOSX() )
aResult->SizeTo(14,2,14,2); // 14px left/right endcaps in aqua.
else
aResult->SizeTo(5,2,5,2); // 5px for AGA
break;
case NS_THEME_TOOLBAR_BUTTON:
//aResult->SizeTo(5,5,5,5); // 5px around the button in aqua
break;
case NS_THEME_DROPDOWN:
if ( OnMacOSX() )
aResult->SizeTo(9,2,20,2); // 9px left endcaps in aqua, bigger right border for button
else
aResult->SizeTo(3,0,3,0); // 3px for AGA
break;
case NS_THEME_TEXTFIELD:
{
SInt32 shadow = 0, frameOutset = 0;
::GetThemeMetric(kThemeMetricEditTextWhitespace, &shadow);
::GetThemeMetric(kThemeMetricEditTextFrameOutset, &frameOutset);
aResult->SizeTo(shadow + frameOutset, shadow + frameOutset, shadow + frameOutset,
shadow + frameOutset);
break;
}
}
return NS_OK;
}
NS_IMETHODIMP
nsNativeThemeMac::GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* aFrame,
PRUint8 aWidgetType, nsSize* aResult, PRBool* aIsOverridable)
{
// XXX we should probably cache some of these metrics
aResult->SizeTo(0,0);
*aIsOverridable = PR_TRUE;
switch ( aWidgetType ) {
case NS_THEME_CHECKBOX:
{
SInt32 boxHeight = 0, boxWidth = 0;
::GetThemeMetric(kThemeMetricCheckBoxWidth, &boxWidth);
::GetThemeMetric(kThemeMetricCheckBoxHeight, &boxHeight);
aResult->SizeTo(boxWidth, boxHeight);
*aIsOverridable = PR_FALSE;
break;
}
case NS_THEME_RADIO:
{
SInt32 radioHeight = 0, radioWidth = 0;
::GetThemeMetric(kThemeMetricCheckBoxWidth, &radioWidth);
::GetThemeMetric(kThemeMetricCheckBoxHeight, &radioHeight);
aResult->SizeTo(radioWidth, radioHeight);
*aIsOverridable = PR_FALSE;
break;
}
case NS_THEME_DROPDOWN:
{
SInt32 popupHeight = 0;
::GetThemeMetric(kThemeMetricPopupButtonHeight, &popupHeight);
aResult->SizeTo(0, popupHeight);
break;
}
case NS_THEME_DROPDOWN_BUTTON:
// the drawing for this is done by the dropdown, so just make this
// zero sized.
aResult->SizeTo(0,0);
break;
case NS_THEME_TEXTFIELD:
//XXX ?
break;
case NS_THEME_PROGRESSBAR:
{
SInt32 barHeight = 0;
::GetThemeMetric(kThemeMetricNormalProgressBarThickness, &barHeight);
aResult->SizeTo(0, barHeight);
break;
}
case NS_THEME_TREEVIEW_TWISTY:
{
SInt32 twistyHeight = 0, twistyWidth = 0;
::GetThemeMetric(kThemeMetricDisclosureButtonWidth, &twistyWidth);
::GetThemeMetric(kThemeMetricDisclosureButtonHeight, &twistyHeight);
aResult->SizeTo(twistyWidth, twistyHeight);
*aIsOverridable = PR_FALSE;
break;
}
case NS_THEME_SCROLLBAR:
case NS_THEME_SCROLLBAR_BUTTON_UP:
case NS_THEME_SCROLLBAR_BUTTON_DOWN:
case NS_THEME_SCROLLBAR_BUTTON_LEFT:
case NS_THEME_SCROLLBAR_BUTTON_RIGHT:
case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
case NS_THEME_SCROLLBAR_GRIPPER_HORIZONTAL:
case NS_THEME_SCROLLBAR_GRIPPER_VERTICAL:
case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
{
// yeah, i know i'm cheating a little here, but i figure that it
// really doesn't matter if the scrollbar is vertical or horizontal
// and the width metric is a really good metric for every piece
// of the scrollbar.
SInt32 scrollbarWidth = 0;
::GetThemeMetric(kThemeMetricScrollBarWidth, &scrollbarWidth);
aResult->SizeTo(scrollbarWidth, scrollbarWidth);
break;
}
}
return NS_OK;
}
NS_IMETHODIMP
nsNativeThemeMac::WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
nsIAtom* aAttribute, PRBool* aShouldRepaint)
{
// Some widget types just never change state.
switch ( aWidgetType ) {
case NS_THEME_TOOLBOX:
case NS_THEME_TOOLBAR:
case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
case NS_THEME_STATUSBAR:
case NS_THEME_STATUSBAR_PANEL:
case NS_THEME_STATUSBAR_RESIZER_PANEL:
case NS_THEME_PROGRESSBAR_CHUNK:
case NS_THEME_PROGRESSBAR_CHUNK_VERTICAL:
case NS_THEME_PROGRESSBAR:
case NS_THEME_PROGRESSBAR_VERTICAL:
case NS_THEME_TOOLTIP:
case NS_THEME_TAB_PANELS:
case NS_THEME_TAB_PANEL:
*aShouldRepaint = PR_FALSE;
return NS_OK;
}
// XXXdwh Not sure what can really be done here. Can at least guess for
// specific widgets that they're highly unlikely to have certain states.
// For example, a toolbar doesn't care about any states.
if (!aAttribute) {
// Hover/focus/active changed. Always repaint.
*aShouldRepaint = PR_TRUE;
}
else {
// Check the attribute to see if it's relevant.
// disabled, checked, dlgtype, default, etc.
*aShouldRepaint = PR_FALSE;
if (aAttribute == mDisabledAtom || aAttribute == mCheckedAtom ||
aAttribute == mSelectedAtom)
*aShouldRepaint = PR_TRUE;
}
return NS_OK;
}
NS_IMETHODIMP
nsNativeThemeMac::ThemeChanged()
{
// what do we do here?
return NS_OK;
}
PRBool
nsNativeThemeMac::ThemeSupportsWidget(nsIPresContext* aPresContext,
PRUint8 aWidgetType)
{
// XXX We can go even further and call the API to ask if support exists.
PRBool retVal = PR_FALSE;
switch ( aWidgetType ) {
case NS_THEME_CHECKBOX:
case NS_THEME_CHECKBOX_CONTAINER:
case NS_THEME_RADIO:
case NS_THEME_RADIO_CONTAINER:
case NS_THEME_BUTTON:
case NS_THEME_TOOLBAR:
case NS_THEME_STATUSBAR:
case NS_THEME_DROPDOWN:
case NS_THEME_DROPDOWN_BUTTON:
case NS_THEME_DROPDOWN_TEXT:
case NS_THEME_TEXTFIELD:
//case NS_THEME_TOOLBOX:
//case NS_THEME_TOOLBAR_BUTTON:
case NS_THEME_PROGRESSBAR:
case NS_THEME_PROGRESSBAR_VERTICAL:
case NS_THEME_PROGRESSBAR_CHUNK:
case NS_THEME_PROGRESSBAR_CHUNK_VERTICAL:
case NS_THEME_TREEVIEW_TWISTY:
case NS_THEME_SCROLLBAR:
case NS_THEME_SCROLLBAR_BUTTON_UP:
case NS_THEME_SCROLLBAR_BUTTON_DOWN:
case NS_THEME_SCROLLBAR_BUTTON_LEFT:
case NS_THEME_SCROLLBAR_BUTTON_RIGHT:
case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
case NS_THEME_SCROLLBAR_GRIPPER_HORIZONTAL:
case NS_THEME_SCROLLBAR_GRIPPER_VERTICAL:
case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
// for now, only use on osx since i haven't yet verified on os9
if ( OnMacOSX() )
retVal = PR_TRUE;
break;
}
return retVal;
}
PRBool
nsNativeThemeMac::WidgetIsContainer(PRUint8 aWidgetType)
{
// XXXdwh At some point flesh all of this out.
switch ( aWidgetType ) {
case NS_THEME_DROPDOWN_BUTTON:
case NS_THEME_RADIO:
case NS_THEME_CHECKBOX:
case NS_THEME_PROGRESSBAR:
return PR_FALSE;
break;
}
return PR_TRUE;
}

121
gfx/src/mac/nsNativeThemeMac.h Normal file
Просмотреть файл

@ -0,0 +1,121 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/* ***** 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
* Mike Pinkerton (pinkerton@netscape.com)
*
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
* 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 ***** */
#include <Appearance.h>
#include "nsITheme.h"
#include "nsCOMPtr.h"
#include "nsIAtom.h"
#include "nsILookAndFeel.h"
#include "nsIDeviceContext.h"
class nsNativeThemeMac : public nsITheme
{
public:
nsNativeThemeMac();
virtual ~nsNativeThemeMac();
NS_DECL_ISUPPORTS
// The nsITheme interface.
NS_IMETHOD DrawWidgetBackground(nsIRenderingContext* aContext,
nsIFrame* aFrame,
PRUint8 aWidgetType,
const nsRect& aRect,
const nsRect& aClipRect);
NS_IMETHOD GetWidgetBorder(nsIDeviceContext* aContext,
nsIFrame* aFrame,
PRUint8 aWidgetType,
nsMargin* aResult);
NS_IMETHOD GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* aFrame,
PRUint8 aWidgetType,
nsSize* aResult, PRBool* aIsOverridable);
NS_IMETHOD WidgetStateChanged(nsIFrame* aFrame, PRUint8 aWidgetType,
nsIAtom* aAttribute, PRBool* aShouldRepaint);
NS_IMETHOD ThemeChanged();
PRBool ThemeSupportsWidget(nsIPresContext* aPresContext, PRUint8 aWidgetType);
PRBool WidgetIsContainer(PRUint8 aWidgetType);
protected:
//nsresult GetThemePartAndState(nsIFrame* aFrame, PRUint8 aWidgetType,
// PRInt32& aPart, PRInt32& aState);
nsresult GetSystemColor(PRUint8 aWidgetType, nsILookAndFeel::nsColorID& aColorID);
nsresult GetSystemFont(PRUint8 aWidgetType, nsSystemFontID& aFont);
PRBool IsDisabled(nsIFrame* aFrame);
PRBool IsChecked(nsIFrame* aFrame);
PRBool IsSelected(nsIFrame* aFrame);
PRBool IsDefaultButton(nsIFrame* aFrame);
PRBool IsIndeterminate(nsIFrame* aFrame);
// Appearance Manager drawing routines
void DrawCheckbox ( const Rect& inBoxRect, PRBool inChecked, PRBool inDisabled, PRInt32 inState ) ;
void DrawRadio ( const Rect& inBoxRect, PRBool inChecked, PRBool inDisabled, PRInt32 inState ) ;
void DrawToolbar ( const Rect& inBoxRect ) ;
void DrawEditText ( const Rect& inBoxRect, PRBool inIsDisabled ) ;
void DrawProgress ( const Rect& inBoxRect, PRBool inIsDisabled, PRBool inIsIndeterminate,
PRBool inIsHorizontal, PRInt32 inValue ) ;
void DrawFullScrollbar ( const Rect& inScrollbarRect, PRInt32 inWidgetHit, PRInt32 inLineHeight, PRBool inIsDisabled,
PRInt32 inMax, PRInt32 inValue, PRInt32 inState ) ;
// void DrawScrollArrows ( const Rect& inScrollbarRect, PRBool inIsDisabled, PRInt32 inWidget, PRInt32 inState ) ;
void DrawButton ( ThemeButtonKind inKind, const Rect& inBoxRect, PRBool inIsDefault,
PRBool inDisabled, PRInt32 inState ) ;
void DrawCheckboxRadio ( ThemeButtonKind inKind, const Rect& inBoxRect, PRBool inChecked,
PRBool inDisabled, PRInt32 inState ) ;
// some utility routines
nsIFrame* GetScrollbarParent(nsIFrame* inButton, nsPoint* offset);
nsIFrame* GetScrollbarParentLocalRect(nsIFrame* inButton, nsTransform2D* inMatrix, Rect* outAdjustedRect);
private:
nsCOMPtr<nsIAtom> mCheckedAtom;
nsCOMPtr<nsIAtom> mDisabledAtom;
nsCOMPtr<nsIAtom> mSelectedAtom;
nsCOMPtr<nsIAtom> mDefaultAtom;
nsCOMPtr<nsIAtom> mValueAtom;
nsCOMPtr<nsIAtom> mModeAtom;
nsCOMPtr<nsIAtom> mOrientAtom;
nsCOMPtr<nsIAtom> mCurPosAtom;
nsCOMPtr<nsIAtom> mMaxPosAtom;
nsCOMPtr<nsIAtom> mScrollbarAtom;
};

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

@ -459,7 +459,8 @@ CSS_KEY(scrollbargripper-vertical, scrollbargripper_vertical)
CSS_KEY(textfield, textfield)
CSS_KEY(caret, caret)
CSS_KEY(menulist, menulist)
CSS_KEY(menulistbutton, menulistbutton)
CSS_KEY(menulist-button, menulistbutton)
CSS_KEY(menulist-text, menulisttext)
CSS_KEY(slider, slider)
CSS_KEY(sliderthumb, sliderthumb)
CSS_KEY(sliderthumbstart, sliderthumbstart)

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

@ -177,6 +177,7 @@ const PRInt32 nsCSSProps::kAppearanceKTable[] = {
eCSSKeyword_caret, NS_THEME_TEXTFIELD_CARET,
eCSSKeyword_menulist, NS_THEME_DROPDOWN,
eCSSKeyword_menulistbutton, NS_THEME_DROPDOWN_BUTTON,
eCSSKeyword_menulisttext, NS_THEME_DROPDOWN_TEXT,
eCSSKeyword_slider, NS_THEME_SLIDER,
eCSSKeyword_sliderthumb, NS_THEME_SLIDER_THUMB,
eCSSKeyword_sliderthumbstart, NS_THEME_SLIDER_THUMB_START,

1
themes/classic/global/mac/button.css
Просмотреть файл

@ -30,6 +30,7 @@
/* :::::::::: button :::::::::: */
button {
-moz-appearance: button;
-moz-user-focus: ignore;
margin: 1px 5px 2px 5px;
min-width: 6.3em;

2
themes/classic/global/mac/checkbox.css
Просмотреть файл

@ -30,6 +30,7 @@
/* ::::: checkbox ::::: */
checkbox {
-moz-appearance: checkbox-container;
-moz-user-focus: ignore;
-moz-box-align: center;
margin: 2px 4px;
@ -58,6 +59,7 @@ checkbox[disabled="true"] {
/* ::::: checkmark image ::::: */
.checkbox-check {
-moz-appearance: checkbox;
width: 14px;
height: 12px;
background: url("chrome://global/skin/checkbox/cbox.gif") no-repeat;

2
themes/classic/global/mac/global.css
Просмотреть файл

@ -110,7 +110,7 @@ iframe {
/* ::::: statusbar ::::: */
statusbar {
-moz-appearance: statusbar;
border-top: 1px solid #000000 !important;
border-left: 1px solid ThreeDShadow;
border-right: none !important

3
themes/classic/global/mac/menulist.css
Просмотреть файл

@ -31,11 +31,13 @@
/* :::::::::: menulist :::::::::: */
menulist {
-moz-appearance: menulist;
-moz-user-focus: ignore;
margin: 2px 4px;
}
.menulist-label-box {
-moz-appearance: menulist-text;
-moz-box-align: center;
-moz-box-pack: center;
border: 2px solid;
@ -55,6 +57,7 @@ menulist {
/* ..... dropmarker ..... */
.menulist-dropmarker {
-moz-appearance: menulist-button;
-moz-box-align: center;
-moz-box-pack: center;
border: 3px solid;

2
themes/classic/global/mac/outliner.css
Просмотреть файл

@ -178,12 +178,14 @@ outlinerbody:-moz-outliner-column(insertafter) {
/* ::::: twisty ::::: */
outlinerbody:-moz-outliner-twisty {
-moz-appearance: treetwisty;
padding-right: 2px;
width: 10px; /* The image's width is 10 pixels */
list-style-image: url("chrome://global/skin/tree/twisty-clsd.gif");
}
outlinerbody:-moz-outliner-twisty(open) {
-moz-appearance: treetwisty;
width: 10px; /* The image's width is 10 pixels */
list-style-image: url("chrome://global/skin/tree/twisty-open.gif");
}

1
themes/classic/global/mac/progressmeter.css
Просмотреть файл

@ -44,6 +44,7 @@
/* ::::: progressmeter ::::: */
progressmeter {
-moz-appearance: progressbar;
margin: 2px 4px;
border: 2px solid;
-moz-border-top-colors: #AAAAAA #000000;

2
themes/classic/global/mac/radio.css
Просмотреть файл

@ -34,6 +34,7 @@ radiogroup {
}
radio {
-moz-appearance: radio-container;
-moz-box-align: center;
margin: 2px 4px;
padding: 1px 2px 1px 4px;
@ -61,6 +62,7 @@ radio[disabled="true"] {
/* ::::: checkmark image ::::: */
.radio-check {
-moz-appearance: radio;
width: 14px;
height: 12px;
background: url("chrome://global/skin/radio/radio.gif") no-repeat;

131
themes/classic/global/mac/scrollbars.css
Просмотреть файл

@ -1,131 +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)
*/
/* ===== scrollbars.css =================================================
== Styles used by XUL scrollbar-related elements.
======================================================================= */
@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
/* ::::: scrollbar ::::: */
scrollbar {
-moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
cursor: default;
}
/* ::::: slider ::::: */
slider {
height: 16px;
background: url("chrome://global/skin/scrollbar/slider-hrz.gif") #AAAAAA;
}
slider[orient="vertical"] {
width: 16px;
height: none;
background-image: url("chrome://global/skin/scrollbar/slider-vrt.gif");
}
/* ::::: borders for thumb and buttons ::::: */
thumb {
border: 2px solid;
-moz-border-top-colors: #000000 -moz-mac-accentregularhighlight;
-moz-border-right-colors: #000000 -moz-mac-accentlightshadow;
-moz-border-bottom-colors: #000000 -moz-mac-accentlightshadow;
-moz-border-left-colors: #000000 -moz-mac-accentregularhighlight;
min-width: 10px;
background: url("chrome://global/skin/scrollbar/thumb-hrz.png") -moz-mac-accentface no-repeat 50% 50%;
}
thumb:active {
-moz-border-top-colors: #000000 -moz-mac-accentregularhighlight;
-moz-border-right-colors: #000000 -moz-mac-accentlightshadow;
-moz-border-bottom-colors: #000000 -moz-mac-accentlightshadow;
-moz-border-left-colors: #000000 -moz-mac-accentregularhighlight;
background-color: -moz-mac-accentlightshadow;
background-image: url("chrome://global/skin/scrollbar/thumb-hrz-act.png");
}
thumb[orient="vertical"] {
min-width: 0;
min-height: 16px;
background-image: url("chrome://global/skin/scrollbar/thumb-vrt.png");
}
thumb[orient="vertical"]:active {
background-image: url("chrome://global/skin/scrollbar/thumb-vrt-act.png");
}
/* ::::: thumb (horizontal) ::::: */
thumb {
min-height: 16px;
}
thumb[orient="horizontal"] {
min-width: 16px;
}
/* ::::: scrollbar button ::::: */
scrollbarbutton {
width: 16px;
height: 16px;
border: 2px solid;
-moz-border-top-colors: #000000 #FFFFFF;
-moz-border-right-colors: #000000 #BBBBBB;
-moz-border-bottom-colors: #000000 #BBBBBB;
-moz-border-left-colors: #000000 #FFFFFF;
background: #DDDDDD no-repeat 50% 50%;
}
scrollbarbutton:hover:active {
-moz-border-top-colors: #000000 #444444;
-moz-border-right-colors: #000000 #AAAAAA;
-moz-border-bottom-colors: #000000 #AAAAAA;
-moz-border-left-colors: #000000 #444444;
background-color: #666666;
}
/* ..... increment .... */
scrollbarbutton[type="increment"] {
background-image: url("chrome://global/skin/scrollbar/btn-rit.gif")
}
scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] {
background-image: url("chrome://global/skin/scrollbar/btn-dn.gif")
}
/* ..... decrement .... */
scrollbarbutton[type="decrement"] {
background-image: url("chrome://global/skin/scrollbar/btn-lft.gif")
}
scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
background-image: url("chrome://global/skin/scrollbar/btn-up.gif")
}

1
themes/classic/global/mac/textbox.css
Просмотреть файл

@ -33,6 +33,7 @@
/* ::::: textbox ::::: */
textbox {
-moz-appearance: textfield;
cursor: text;
margin: 2px 4px;
border: 3px solid;

2
themes/classic/global/mac/toolbar.css
Просмотреть файл

@ -30,6 +30,7 @@
/* ::::: toolbox ::::: */
toolbox {
-moz-appearance: toolbox;
background-color: -moz-Dialog;
border-left: 1px solid ThreeDShadow;
border-top: 1px solid ThreeDShadow;
@ -41,6 +42,7 @@ toolbox {
toolbar,
menubar {
-moz-appearance: toolbar;
min-width: 1px; /* DON'T DELETE!
Prevents hiding of scrollbars in browser when window is made smaller.*/
}

2
themes/classic/global/mac/toolbarbutton.css
Просмотреть файл

@ -54,6 +54,7 @@ toolbarbutton {
toolbarbutton:hover,
toolbarbutton[buttonover="true"] {
-moz-appearance: toolbarbutton;
-moz-border-top-colors: #000000 #FFFFFF;
-moz-border-right-colors: #000000 #9D9D9D;
-moz-border-bottom-colors: #000000 #9D9D9D;
@ -62,6 +63,7 @@ toolbarbutton[buttonover="true"] {
toolbarbutton:hover:active,
toolbarbutton[open="true"] {
-moz-appearance: toolbarbutton;
-moz-border-top-colors: #000000 #444444;
-moz-border-right-colors: #000000 #AAAAAA;
-moz-border-bottom-colors: #000000 #AAAAAA;

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

@ -197,6 +197,7 @@ treecell.propertylist
.tree-cell-twisty
{
-moz-appearance : treetwisty;
list-style-image : url("chrome://global/skin/tree/twisty-clsd.gif");
-moz-user-focus : ignore;
padding-right : 2px;

2
xpfe/global/resources/content/bindings/radio.xml
Просмотреть файл

@ -275,7 +275,7 @@
</resources>
<content>
<xul:image class="radio-check" inherits="checked,disabled"/>
<xul:image class="radio-check" inherits="checked,disabled,selected"/>
<xul:hbox class="radio-label-box" flex="1">
<xul:image class="radio-icon" inherits="src"/>
<xul:label class="radio-label" inherits="xbl:text=label,accesskey,crop" flex="1"/>