tweak scrollbars and fix non-carbon bustage. i'll get back to this later.

This commit is contained in:
pinkerton%netscape.com 2002-01-15 16:25:38 +00:00
Родитель 39c9942b8c
Коммит 9cce550598
1 изменённых файлов: 12 добавлений и 1 удалений

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

@ -387,7 +387,7 @@ nsNativeThemeMac::DrawEditText ( const Rect& inBoxRect, PRBool inIsDisabled )
{ {
Pattern whitePat; Pattern whitePat;
::BackColor(whiteColor); ::BackColor(whiteColor);
::BackPat(GetQDGlobalsWhite(&whitePat)); // ::BackPat(GetQDGlobalsWhite(&whitePat));
::EraseRect(&inBoxRect); ::EraseRect(&inBoxRect);
ThemeDrawState drawState = inIsDisabled ? kThemeStateActive : kThemeStateDisabled; ThemeDrawState drawState = inIsDisabled ? kThemeStateActive : kThemeStateDisabled;
@ -439,6 +439,7 @@ nsNativeThemeMac::DrawFullScrollbar ( const Rect& inSbarRect, PRInt32 inWidgetHi
viewSize /= inLineHeight; viewSize /= inLineHeight;
// Figure out if something should be drawn depressed // Figure out if something should be drawn depressed
//printf("-- widget drawn is %ld\n", inWidgetHit);
ThemeTrackPressState pressState = 0L; ThemeTrackPressState pressState = 0L;
if ( (inState & NS_EVENT_STATE_ACTIVE && inState & NS_EVENT_STATE_HOVER) ) { if ( (inState & NS_EVENT_STATE_ACTIVE && inState & NS_EVENT_STATE_HOVER) ) {
//printf("something is :hover:active!\n"); //printf("something is :hover:active!\n");
@ -446,6 +447,9 @@ nsNativeThemeMac::DrawFullScrollbar ( const Rect& inSbarRect, PRInt32 inWidgetHi
case NS_THEME_SCROLLBAR_BUTTON_UP: case NS_THEME_SCROLLBAR_BUTTON_UP:
pressState = kThemeTopOutsideArrowPressed; pressState = kThemeTopOutsideArrowPressed;
break; break;
case NS_THEME_SCROLLBAR_BUTTON_DOWN:
pressState = kThemeBottomOutsideArrowPressed;
break;
} }
} }
@ -566,10 +570,17 @@ nsNativeThemeMac::DrawWidgetBackground(nsIRenderingContext* aContext, nsIFrame*
break; break;
#endif #endif
case NS_THEME_SCROLLBAR_GRIPPER_HORIZONTAL:
case NS_THEME_SCROLLBAR_GRIPPER_VERTICAL:
// do nothing, these don't exist in aqua
break;
case NS_THEME_SCROLLBAR_THUMB_VERTICAL: case NS_THEME_SCROLLBAR_THUMB_VERTICAL:
case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL: case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
case NS_THEME_SCROLLBAR_BUTTON_UP: case NS_THEME_SCROLLBAR_BUTTON_UP:
case NS_THEME_SCROLLBAR_BUTTON_DOWN: case NS_THEME_SCROLLBAR_BUTTON_DOWN:
case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL:
case NS_THEME_SCROLLBAR_TRACK_VERTICAL:
case NS_THEME_SCROLLBAR_BUTTON_LEFT: case NS_THEME_SCROLLBAR_BUTTON_LEFT:
case NS_THEME_SCROLLBAR_BUTTON_RIGHT: case NS_THEME_SCROLLBAR_BUTTON_RIGHT:
{ {