From 9196b9bfa90d3c89a5232d4b3b53bc338bd99aa0 Mon Sep 17 00:00:00 2001 From: Jim Mathies Date: Mon, 9 Aug 2010 20:49:34 -0500 Subject: [PATCH] Bug 574454 - Add window frame css styles. r=dbaron. --- gfx/src/nsThemeConstants.h | 11 +++++++++++ layout/style/nsCSSKeywordList.h | 10 +++++++++- layout/style/nsCSSProps.cpp | 11 ++++++++++- 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/gfx/src/nsThemeConstants.h b/gfx/src/nsThemeConstants.h index f00a47e745..047d0da07b 100644 --- a/gfx/src/nsThemeConstants.h +++ b/gfx/src/nsThemeConstants.h @@ -237,3 +237,14 @@ // Vista glass #define NS_THEME_WIN_GLASS 230 + +// Windows themed window frame elements +#define NS_THEME_WINDOW_TITLEBAR 231 +#define NS_THEME_WINDOW_TITLEBAR_MAXIMIZED 232 +#define NS_THEME_WINDOW_FRAME_LEFT 233 +#define NS_THEME_WINDOW_FRAME_RIGHT 234 +#define NS_THEME_WINDOW_FRAME_BOTTOM 235 +#define NS_THEME_WINDOW_BUTTON_CLOSE 236 +#define NS_THEME_WINDOW_BUTTON_MINIMIZE 237 +#define NS_THEME_WINDOW_BUTTON_MAXIMIZE 238 +#define NS_THEME_WINDOW_BUTTON_RESTORE 239 diff --git a/layout/style/nsCSSKeywordList.h b/layout/style/nsCSSKeywordList.h index 201882a3d0..2d7ab7cef3 100644 --- a/layout/style/nsCSSKeywordList.h +++ b/layout/style/nsCSSKeywordList.h @@ -592,8 +592,16 @@ CSS_KEY(-moz-win-browsertabbar-toolbox, _moz_win_browsertabbar_toolbox) CSS_KEY(-moz-win-mediatext, _moz_win_mediatext) CSS_KEY(-moz-win-communicationstext, _moz_win_communicationstext) CSS_KEY(-moz-win-glass, _moz_win_glass) +CSS_KEY(-moz-window-titlebar, _moz_window_titlebar) +CSS_KEY(-moz-window-titlebar-maximized, _moz_window_titlebar_maximized) +CSS_KEY(-moz-window-frame-left, _moz_window_frame_left) +CSS_KEY(-moz-window-frame-right, _moz_window_frame_right) +CSS_KEY(-moz-window-frame-bottom, _moz_window_frame_bottom) +CSS_KEY(-moz-window-button-close, _moz_window_button_close) +CSS_KEY(-moz-window-button-minimize, _moz_window_button_minimize) +CSS_KEY(-moz-window-button-maximize, _moz_window_button_maximize) +CSS_KEY(-moz-window-button-restore, _moz_window_button_restore) CSS_KEY(-moz-mac-unified-toolbar, _moz_mac_unified_toolbar) - CSS_KEY(alphabetic, alphabetic) CSS_KEY(bevel, bevel) CSS_KEY(butt, butt) diff --git a/layout/style/nsCSSProps.cpp b/layout/style/nsCSSProps.cpp index df9c96d196..09dea43d81 100644 --- a/layout/style/nsCSSProps.cpp +++ b/layout/style/nsCSSProps.cpp @@ -499,7 +499,16 @@ const PRInt32 nsCSSProps::kAppearanceKTable[] = { eCSSKeyword__moz_win_communications_toolbox, NS_THEME_WIN_COMMUNICATIONS_TOOLBOX, eCSSKeyword__moz_win_browsertabbar_toolbox, NS_THEME_WIN_BROWSER_TAB_BAR_TOOLBOX, eCSSKeyword__moz_win_glass, NS_THEME_WIN_GLASS, - eCSSKeyword__moz_mac_unified_toolbar, NS_THEME_MOZ_MAC_UNIFIED_TOOLBAR, + eCSSKeyword__moz_mac_unified_toolbar, NS_THEME_MOZ_MAC_UNIFIED_TOOLBAR, + eCSSKeyword__moz_window_titlebar, NS_THEME_WINDOW_TITLEBAR, + eCSSKeyword__moz_window_titlebar_maximized, NS_THEME_WINDOW_TITLEBAR_MAXIMIZED, + eCSSKeyword__moz_window_frame_left, NS_THEME_WINDOW_FRAME_LEFT, + eCSSKeyword__moz_window_frame_right, NS_THEME_WINDOW_FRAME_RIGHT, + eCSSKeyword__moz_window_frame_bottom, NS_THEME_WINDOW_FRAME_BOTTOM, + eCSSKeyword__moz_window_button_close, NS_THEME_WINDOW_BUTTON_CLOSE, + eCSSKeyword__moz_window_button_minimize, NS_THEME_WINDOW_BUTTON_MINIMIZE, + eCSSKeyword__moz_window_button_maximize, NS_THEME_WINDOW_BUTTON_MAXIMIZE, + eCSSKeyword__moz_window_button_restore, NS_THEME_WINDOW_BUTTON_RESTORE, eCSSKeyword_UNKNOWN,-1 }; -- 2.11.4.GIT