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

Bug 1192053 - Native theming: Support for Mac OS X source lists (background part). r=gijs, mstange.

This commit is contained in:
stefanh@inbox.com 2016-05-17 07:37:05 +02:00
Родитель bd544fa97d
Коммит d76d8b9c90
10 изменённых файлов: 56 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

14
browser/themes/osx/browser.css
Просмотреть файл

@ -2375,16 +2375,10 @@ html|span.ac-emphasize-text-url {
/* ----- SIDEBAR ELEMENTS ----- */
#sidebar-box {
background-color: hsl(212,19%,85%);
background-image: linear-gradient(hsl(213,26%,93%), hsl(212,19%,85%));
-moz-appearance: -moz-mac-source-list;
box-shadow: inset -2px 0 0 hsla(0,0%,100%,.2);
}
#sidebar-box:-moz-window-inactive {
background-color: hsl(0,0%,92%);
background-image: linear-gradient(hsl(0,0%,97%), hsl(0,0%,92%));
}
sidebarheader {
padding: 2px 2px 0;
text-shadow: 0 1px 0 hsla(0,0%,100%,.5);
@ -2434,15 +2428,9 @@ sidebarheader {
@media (-moz-mac-yosemite-theme) {
#sidebar-box {
-moz-appearance: -moz-mac-vibrancy-light;
background-image: none;
box-shadow: none;
}
#sidebar-box:-moz-window-inactive {
background-image: none;
}
sidebarheader {
text-shadow: none;
font-weight: 500;

15
browser/themes/osx/places/organizer.css
Просмотреть файл

@ -249,30 +249,17 @@
/* Place List, Place Content */
#placesList {
background-color: hsl(212,19%,85%);
background-image: linear-gradient(hsl(213,26%,93%), hsl(212,19%,85%));
-moz-appearance: -moz-mac-source-list;
box-shadow: inset -2px 0 0 hsla(0,0%,100%,.2);
width: 160px;
}
#placesList:-moz-window-inactive {
background-color: hsl(0,0%,92%);
background-image: linear-gradient(hsl(0,0%,97%), hsl(0,0%,92%));
}
@media (-moz-mac-yosemite-theme) {
#placesList {
-moz-appearance: -moz-mac-vibrancy-light;
background-image: none;
box-shadow: none;
}
#placesList:-moz-window-inactive {
background-image: none;
}
}
/* Info box */
#detailsDeck {
border-top: 1px solid #919191;

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

@ -291,3 +291,4 @@
#define NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED 246
#define NS_THEME_GTK_INFO_BAR 247
#define NS_THEME_MAC_SOURCE_LIST 248

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

@ -756,6 +756,7 @@ CSS_KEY(-moz-mac-vibrancy-light, _moz_mac_vibrancy_light)
CSS_KEY(-moz-mac-vibrancy-dark, _moz_mac_vibrancy_dark)
CSS_KEY(-moz-mac-disclosure-button-closed, _moz_mac_disclosure_button_closed)
CSS_KEY(-moz-mac-disclosure-button-open, _moz_mac_disclosure_button_open)
CSS_KEY(-moz-mac-source-list, _moz_mac_source_list)
CSS_KEY(alphabetic, alphabetic)
CSS_KEY(bevel, bevel)
CSS_KEY(butt, butt)

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

@ -867,6 +867,7 @@ const KTableEntry nsCSSProps::kAppearanceKTable[] = {
{ eCSSKeyword__moz_mac_disclosure_button_open, NS_THEME_MAC_DISCLOSURE_BUTTON_OPEN },
{ eCSSKeyword__moz_mac_disclosure_button_closed, NS_THEME_MAC_DISCLOSURE_BUTTON_CLOSED },
{ eCSSKeyword__moz_gtk_info_bar, NS_THEME_GTK_INFO_BAR },
{ eCSSKeyword__moz_mac_source_list, NS_THEME_MAC_SOURCE_LIST },
{ eCSSKeyword_UNKNOWN, -1 }
};

3
widget/cocoa/VibrancyManager.h
Просмотреть файл

@ -26,7 +26,8 @@ enum class VibrancyType {
TOOLTIP,
MENU,
HIGHLIGHTED_MENUITEM,
SHEET
SHEET,
SOURCE_LIST
};
/**

20
widget/cocoa/VibrancyManager.mm
Просмотреть файл

@ -186,6 +186,7 @@ AppearanceForVibrancyType(VibrancyType aType)
case VibrancyType::MENU:
case VibrancyType::HIGHLIGHTED_MENUITEM:
case VibrancyType::SHEET:
case VibrancyType::SOURCE_LIST:
return [NSAppearanceClass performSelector:@selector(appearanceNamed:)
withObject:@"NSAppearanceNameVibrantLight"];
case VibrancyType::DARK:
@ -208,7 +209,8 @@ enum {
#if !defined(MAC_OS_X_VERSION_10_11) || MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_11
enum {
NSVisualEffectMaterialMenu = 5
NSVisualEffectMaterialMenu = 5,
NSVisualEffectMaterialSidebar = 7
};
#endif
@ -263,15 +265,15 @@ VibrancyManager::CreateEffectView(VibrancyType aType, NSRect aRect)
withObject:AppearanceForVibrancyType(aType)];
[effectView setState:VisualEffectStateForVibrancyType(aType)];
BOOL canUseElCapitanMaterials = nsCocoaFeatures::OnElCapitanOrLater();
if (aType == VibrancyType::MENU) {
if (nsCocoaFeatures::OnElCapitanOrLater()) {
[effectView setMaterial:NSVisualEffectMaterialMenu];
} else {
// Before 10.11 there is no material that perfectly matches the menu
// look. Of all available material types, NSVisualEffectMaterialTitlebar
// is the one that comes closest.
[effectView setMaterial:NSVisualEffectMaterialTitlebar];
}
// Before 10.11 there is no material that perfectly matches the menu
// look. Of all available material types, NSVisualEffectMaterialTitlebar
// is the one that comes closest.
[effectView setMaterial:canUseElCapitanMaterials ? NSVisualEffectMaterialMenu
: NSVisualEffectMaterialTitlebar];
} else if (aType == VibrancyType::SOURCE_LIST && canUseElCapitanMaterials) {
[effectView setMaterial:NSVisualEffectMaterialSidebar];
} else if (aType == VibrancyType::HIGHLIGHTED_MENUITEM) {
[effectView setMaterial:NSVisualEffectMaterialMenuItem];
if ([effectView respondsToSelector:@selector(setEmphasized:)]) {

8
widget/cocoa/nsChildView.mm
Просмотреть файл

@ -2488,9 +2488,12 @@ nsChildView::UpdateVibrancy(const nsTArray<ThemeGeometry>& aThemeGeometries)
GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeTooltip);
LayoutDeviceIntRegion highlightedMenuItemRegion =
GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeHighlightedMenuItem);
LayoutDeviceIntRegion sourceListRegion =
GatherThemeGeometryRegion(aThemeGeometries, nsNativeThemeCocoa::eThemeGeometryTypeSourceList);
MakeRegionsNonOverlapping(sheetRegion, vibrantLightRegion, vibrantDarkRegion,
menuRegion, tooltipRegion, highlightedMenuItemRegion);
menuRegion, tooltipRegion, highlightedMenuItemRegion,
sourceListRegion);
auto& vm = EnsureVibrancyManager();
vm.UpdateVibrantRegion(VibrancyType::LIGHT, vibrantLightRegion);
@ -2498,6 +2501,7 @@ nsChildView::UpdateVibrancy(const nsTArray<ThemeGeometry>& aThemeGeometries)
vm.UpdateVibrantRegion(VibrancyType::MENU, menuRegion);
vm.UpdateVibrantRegion(VibrancyType::HIGHLIGHTED_MENUITEM, highlightedMenuItemRegion);
vm.UpdateVibrantRegion(VibrancyType::SHEET, sheetRegion);
vm.UpdateVibrantRegion(VibrancyType::SOURCE_LIST, sourceListRegion);
vm.UpdateVibrantRegion(VibrancyType::DARK, vibrantDarkRegion);
}
@ -2525,6 +2529,8 @@ ThemeGeometryTypeToVibrancyType(nsITheme::ThemeGeometryType aThemeGeometryType)
return VibrancyType::HIGHLIGHTED_MENUITEM;
case nsNativeThemeCocoa::eThemeGeometryTypeSheet:
return VibrancyType::SHEET;
case nsNativeThemeCocoa::eThemeGeometryTypeSourceList:
return VibrancyType::SOURCE_LIST;
default:
MOZ_CRASH();
}

1
widget/cocoa/nsNativeThemeCocoa.h
Просмотреть файл

@ -40,6 +40,7 @@ public:
eThemeGeometryTypeVibrancyDark,
eThemeGeometryTypeTooltip,
eThemeGeometryTypeSheet,
eThemeGeometryTypeSourceList,
};
nsNativeThemeCocoa();

30
widget/cocoa/nsNativeThemeCocoa.mm
Просмотреть файл

@ -3006,6 +3006,31 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext,
CGContextFillRect(cgContext, CGRectMake(x + 1, y + h - 1, w - 2, 1));
}
break;
case NS_THEME_MAC_SOURCE_LIST: {
if (VibrancyManager::SystemSupportsVibrancy()) {
ThemeGeometryType type = ThemeGeometryTypeForWidget(aFrame, aWidgetType);
DrawVibrancyBackground(cgContext, macRect, aFrame, type);
} else {
CGGradientRef backgroundGradient;
CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB();
CGFloat activeGradientColors[8] = { 0.9137, 0.9294, 0.9490, 1.0,
0.8196, 0.8471, 0.8784, 1.0 };
CGFloat inactiveGradientColors[8] = { 0.9686, 0.9686, 0.9686, 1.0,
0.9216, 0.9216, 0.9216, 1.0 };
CGPoint start = macRect.origin;
CGPoint end = CGPointMake(macRect.origin.x,
macRect.origin.y + macRect.size.height);
BOOL isActive = FrameIsInActiveWindow(aFrame);
backgroundGradient =
CGGradientCreateWithColorComponents(rgb, isActive ? activeGradientColors
: inactiveGradientColors, NULL, 2);
CGContextDrawLinearGradient(cgContext, backgroundGradient, start, end, 0);
CGGradientRelease(backgroundGradient);
CGColorSpaceRelease(rgb);
}
}
break;
case NS_THEME_TAB:
DrawSegment(cgContext, macRect, eventState, aFrame, tabRenderSettings);
@ -3748,6 +3773,7 @@ nsNativeThemeCocoa::ThemeSupportsWidget(nsPresContext* aPresContext, nsIFrame* a
case NS_THEME_TREEVIEW_HEADER_SORTARROW:
case NS_THEME_TREEVIEW_TREEITEM:
case NS_THEME_TREEVIEW_LINE:
case NS_THEME_MAC_SOURCE_LIST:
case NS_THEME_RANGE:
@ -3888,6 +3914,7 @@ nsNativeThemeCocoa::NeedToClearBackgroundBehindWidget(nsIFrame* aFrame,
uint8_t aWidgetType)
{
switch (aWidgetType) {
case NS_THEME_MAC_SOURCE_LIST:
case NS_THEME_MAC_VIBRANCY_LIGHT:
case NS_THEME_MAC_VIBRANCY_DARK:
case NS_THEME_TOOLTIP:
@ -3917,6 +3944,7 @@ nsNativeThemeCocoa::WidgetProvidesFontSmoothingBackgroundColor(nsIFrame* aFrame,
nscolor* aColor)
{
switch (aWidgetType) {
case NS_THEME_MAC_SOURCE_LIST:
case NS_THEME_MAC_VIBRANCY_LIGHT:
case NS_THEME_MAC_VIBRANCY_DARK:
case NS_THEME_TOOLTIP:
@ -3973,6 +4001,8 @@ nsNativeThemeCocoa::ThemeGeometryTypeForWidget(nsIFrame* aFrame, uint8_t aWidget
}
case NS_THEME_DIALOG:
return IsWindowSheet(aFrame) ? eThemeGeometryTypeSheet : eThemeGeometryTypeUnknown;
case NS_THEME_MAC_SOURCE_LIST:
return eThemeGeometryTypeSourceList;
default:
return eThemeGeometryTypeUnknown;
}