зеркало из https://github.com/mozilla/pjs.git
implement NS_THEME_TOOLBAR_SEPARATOR, also patch outliner to support it. r=bryner,smfr/sr=blake/a=shaver. bug#127722
This commit is contained in:
Родитель
a990877153
Коммит
55b9610b0b
|
@ -514,7 +514,15 @@ void
|
||||||
nsNativeThemeMac::DrawTabPanel ( const Rect& inBoxRect, PRBool inIsDisabled )
|
nsNativeThemeMac::DrawTabPanel ( const Rect& inBoxRect, PRBool inIsDisabled )
|
||||||
{
|
{
|
||||||
ThemeDrawState drawState = inIsDisabled ? kThemeStateActive : kThemeStateDisabled;
|
ThemeDrawState drawState = inIsDisabled ? kThemeStateActive : kThemeStateDisabled;
|
||||||
::DrawThemeTabPane(&inBoxRect, kThemeStateActive);
|
::DrawThemeTabPane(&inBoxRect, drawState);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void
|
||||||
|
nsNativeThemeMac::DrawSeparator ( const Rect& inBoxRect, PRBool inIsDisabled )
|
||||||
|
{
|
||||||
|
ThemeDrawState drawState = inIsDisabled ? kThemeStateActive : kThemeStateDisabled;
|
||||||
|
::DrawThemeSeparator(&inBoxRect, drawState);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -705,6 +713,9 @@ nsNativeThemeMac::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame*
|
||||||
DrawButton ( kThemePushButton, macRect, IsDefaultButton(aFrame), IsDisabled(aFrame),
|
DrawButton ( kThemePushButton, macRect, IsDefaultButton(aFrame), IsDisabled(aFrame),
|
||||||
kThemeButtonOn, kThemeAdornmentNone, eventState );
|
kThemeButtonOn, kThemeAdornmentNone, eventState );
|
||||||
break;
|
break;
|
||||||
|
case NS_THEME_TOOLBAR_SEPARATOR:
|
||||||
|
DrawSeparator ( macRect, IsDisabled(aFrame) );
|
||||||
|
break;
|
||||||
|
|
||||||
case NS_THEME_TOOLBAR:
|
case NS_THEME_TOOLBAR:
|
||||||
case NS_THEME_TOOLBOX:
|
case NS_THEME_TOOLBOX:
|
||||||
|
@ -1093,6 +1104,7 @@ nsNativeThemeMac::ThemeSupportsWidget(nsIPresContext* aPresContext,
|
||||||
case NS_THEME_PROGRESSBAR_VERTICAL:
|
case NS_THEME_PROGRESSBAR_VERTICAL:
|
||||||
case NS_THEME_PROGRESSBAR_CHUNK:
|
case NS_THEME_PROGRESSBAR_CHUNK:
|
||||||
case NS_THEME_PROGRESSBAR_CHUNK_VERTICAL:
|
case NS_THEME_PROGRESSBAR_CHUNK_VERTICAL:
|
||||||
|
case NS_THEME_TOOLBAR_SEPARATOR:
|
||||||
|
|
||||||
case NS_THEME_LISTBOX:
|
case NS_THEME_LISTBOX:
|
||||||
|
|
||||||
|
|
|
@ -109,6 +109,7 @@ protected:
|
||||||
void DrawTab ( const Rect& inBoxRect, PRBool inIsDisabled, PRBool inIsFrontmost,
|
void DrawTab ( const Rect& inBoxRect, PRBool inIsDisabled, PRBool inIsFrontmost,
|
||||||
PRBool inIsHorizontal, PRBool inTabBottom, PRInt32 inState ) ;
|
PRBool inIsHorizontal, PRBool inTabBottom, PRInt32 inState ) ;
|
||||||
void DrawTabPanel ( const Rect& inBoxRect, PRBool inIsDisabled ) ;
|
void DrawTabPanel ( const Rect& inBoxRect, PRBool inIsDisabled ) ;
|
||||||
|
void DrawSeparator ( const Rect& inBoxRect, PRBool inIsDisabled ) ;
|
||||||
// void DrawScrollArrows ( const Rect& inScrollbarRect, PRBool inIsDisabled, PRInt32 inWidget, PRInt32 inState ) ;
|
// void DrawScrollArrows ( const Rect& inScrollbarRect, PRBool inIsDisabled, PRInt32 inWidget, PRInt32 inState ) ;
|
||||||
|
|
||||||
void DrawButton ( ThemeButtonKind inKind, const Rect& inBoxRect, PRBool inIsDefault,
|
void DrawButton ( ThemeButtonKind inKind, const Rect& inBoxRect, PRBool inIsDefault,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче