mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-26 14:22:01 +00:00
Temporarily changed outline to be mozoutline, this will enable us to get links
to show a focus rect. When we get outlines really working, then mozoutline will go away. b=48973 r=attinasi
This commit is contained in:
rods%netscape.com
parent
086397b43d
commit
7f0dcda2ea
@ -56,7 +56,10 @@ static NS_DEFINE_IID(kICSSParserIID, NS_ICSS_PARSER_IID);
|
||||
static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID);
|
||||
static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID);
|
||||
|
||||
//#define ENABLE_OUTLINE // un-comment this to enable the outline properties (bug 9816)
|
||||
#define ENABLE_OUTLINE // un-comment this to enable the outline properties (bug 9816)
|
||||
// XXX un-commenting for temporary fix for nsbeta3+ Bug 48973
|
||||
// so we can use "mozoutline
|
||||
|
||||
//#define ENABLE_COUNTERS // un-comment this to enable counters (bug 15174)
|
||||
|
||||
MOZ_DECL_CTOR_COUNTER(SelectorList);
|
||||
|
||||
@ -146,7 +146,7 @@ CSS_PROP(min-height, min_height, REFLOW)
|
||||
CSS_PROP(min-width, min_width, REFLOW)
|
||||
CSS_PROP(opacity, opacity, VISUAL)
|
||||
CSS_PROP(orphans, orphans, REFLOW)
|
||||
CSS_PROP(outline, outline, VISUAL)
|
||||
CSS_PROP(mozoutline, outline, VISUAL) // XXX This is temporary fix for nsbeta3+ Bug 48973, turning outline into mozoutline
|
||||
CSS_PROP(outline-color, outline_color, VISUAL)
|
||||
CSS_PROP(outline-style, outline_style, VISUAL)
|
||||
CSS_PROP(outline-width, outline_width, VISUAL)
|
||||
|
||||
@ -146,7 +146,7 @@ CSS_PROP(min-height, min_height, REFLOW)
|
||||
CSS_PROP(min-width, min_width, REFLOW)
|
||||
CSS_PROP(opacity, opacity, VISUAL)
|
||||
CSS_PROP(orphans, orphans, REFLOW)
|
||||
CSS_PROP(outline, outline, VISUAL)
|
||||
CSS_PROP(mozoutline, outline, VISUAL) // XXX This is temporary fix for nsbeta3+ Bug 48973, turning outline into mozoutline
|
||||
CSS_PROP(outline-color, outline_color, VISUAL)
|
||||
CSS_PROP(outline-style, outline_style, VISUAL)
|
||||
CSS_PROP(outline-width, outline_width, VISUAL)
|
||||
|
||||
@ -1713,7 +1713,9 @@ nscoord width;
|
||||
|
||||
// This if control whether the outline paints on the inside
|
||||
// or outside of the frame
|
||||
#if 1 // outside
|
||||
// XXX This is temporary fix for nsbeta3+ Bug 48973
|
||||
// so we can use "mozoutline
|
||||
#if 0 // outside
|
||||
nsRect inside(aBorderArea);
|
||||
nsRect outside(inside);
|
||||
inside.Inflate(width, width);
|
||||
@ -1722,11 +1724,11 @@ nscoord width;
|
||||
clipRect.Inflate(width, width); // make clip extra big for now
|
||||
|
||||
#else // inside
|
||||
nsMargin insetMargin;
|
||||
aBorderStyle.GetMargin(insetMargin);
|
||||
nsMargin borderWidth;
|
||||
aBorderStyle.GetBorder(borderWidth);
|
||||
|
||||
nsRect outside(aBorderArea);
|
||||
outside.Deflate(insetMargin);
|
||||
outside.Deflate(borderWidth);
|
||||
nsRect inside(outside);
|
||||
inside.Deflate(width, width);
|
||||
|
||||
|
||||
@ -56,7 +56,10 @@ static NS_DEFINE_IID(kICSSParserIID, NS_ICSS_PARSER_IID);
|
||||
static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID);
|
||||
static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID);
|
||||
|
||||
//#define ENABLE_OUTLINE // un-comment this to enable the outline properties (bug 9816)
|
||||
#define ENABLE_OUTLINE // un-comment this to enable the outline properties (bug 9816)
|
||||
// XXX un-commenting for temporary fix for nsbeta3+ Bug 48973
|
||||
// so we can use "mozoutline
|
||||
|
||||
//#define ENABLE_COUNTERS // un-comment this to enable counters (bug 15174)
|
||||
|
||||
MOZ_DECL_CTOR_COUNTER(SelectorList);
|
||||
|
||||
@ -146,7 +146,7 @@ CSS_PROP(min-height, min_height, REFLOW)
|
||||
CSS_PROP(min-width, min_width, REFLOW)
|
||||
CSS_PROP(opacity, opacity, VISUAL)
|
||||
CSS_PROP(orphans, orphans, REFLOW)
|
||||
CSS_PROP(outline, outline, VISUAL)
|
||||
CSS_PROP(mozoutline, outline, VISUAL) // XXX This is temporary fix for nsbeta3+ Bug 48973, turning outline into mozoutline
|
||||
CSS_PROP(outline-color, outline_color, VISUAL)
|
||||
CSS_PROP(outline-style, outline_style, VISUAL)
|
||||
CSS_PROP(outline-width, outline_width, VISUAL)
|
||||
|
||||
@ -1713,7 +1713,9 @@ nscoord width;
|
||||
|
||||
// This if control whether the outline paints on the inside
|
||||
// or outside of the frame
|
||||
#if 1 // outside
|
||||
// XXX This is temporary fix for nsbeta3+ Bug 48973
|
||||
// so we can use "mozoutline
|
||||
#if 0 // outside
|
||||
nsRect inside(aBorderArea);
|
||||
nsRect outside(inside);
|
||||
inside.Inflate(width, width);
|
||||
@ -1722,11 +1724,11 @@ nscoord width;
|
||||
clipRect.Inflate(width, width); // make clip extra big for now
|
||||
|
||||
#else // inside
|
||||
nsMargin insetMargin;
|
||||
aBorderStyle.GetMargin(insetMargin);
|
||||
nsMargin borderWidth;
|
||||
aBorderStyle.GetBorder(borderWidth);
|
||||
|
||||
nsRect outside(aBorderArea);
|
||||
outside.Deflate(insetMargin);
|
||||
outside.Deflate(borderWidth);
|
||||
nsRect inside(outside);
|
||||
inside.Deflate(width, width);
|
||||
|
||||
|
||||
@ -56,7 +56,10 @@ static NS_DEFINE_IID(kICSSParserIID, NS_ICSS_PARSER_IID);
|
||||
static NS_DEFINE_IID(kICSSStyleSheetIID, NS_ICSS_STYLE_SHEET_IID);
|
||||
static NS_DEFINE_IID(kIStyleSheetIID, NS_ISTYLE_SHEET_IID);
|
||||
|
||||
//#define ENABLE_OUTLINE // un-comment this to enable the outline properties (bug 9816)
|
||||
#define ENABLE_OUTLINE // un-comment this to enable the outline properties (bug 9816)
|
||||
// XXX un-commenting for temporary fix for nsbeta3+ Bug 48973
|
||||
// so we can use "mozoutline
|
||||
|
||||
//#define ENABLE_COUNTERS // un-comment this to enable counters (bug 15174)
|
||||
|
||||
MOZ_DECL_CTOR_COUNTER(SelectorList);
|
||||
|
||||
@ -146,7 +146,7 @@ CSS_PROP(min-height, min_height, REFLOW)
|
||||
CSS_PROP(min-width, min_width, REFLOW)
|
||||
CSS_PROP(opacity, opacity, VISUAL)
|
||||
CSS_PROP(orphans, orphans, REFLOW)
|
||||
CSS_PROP(outline, outline, VISUAL)
|
||||
CSS_PROP(mozoutline, outline, VISUAL) // XXX This is temporary fix for nsbeta3+ Bug 48973, turning outline into mozoutline
|
||||
CSS_PROP(outline-color, outline_color, VISUAL)
|
||||
CSS_PROP(outline-style, outline_style, VISUAL)
|
||||
CSS_PROP(outline-width, outline_width, VISUAL)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user