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

b=346189, children should optionally not affect size of XUL stack; r+sr=roc

This commit is contained in:
Vladimir Vukicevic 2008-06-04 23:46:24 -07:00
Родитель f5a78a104a
Коммит 21a7b6f110
19 изменённых файлов: 230 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
content/base/src/nsGkAtomList.h
Просмотреть файл

@ -397,6 +397,7 @@ GK_ATOM(i, "i")
GK_ATOM(id, "id")
GK_ATOM(_if, "if")
GK_ATOM(iframe, "iframe")
GK_ATOM(ignore, "ignore")
GK_ATOM(ignorecase, "ignorecase")
GK_ATOM(ignorekeys, "ignorekeys")
GK_ATOM(ilayer, "ilayer")
@ -802,6 +803,7 @@ GK_ATOM(staticHint, "staticHint")
GK_ATOM(statustext, "statustext")
GK_ATOM(stop, "stop")
GK_ATOM(stretch, "stretch")
GK_ATOM(stretch_to_fit, "stretch-to-fit")
GK_ATOM(strike, "strike")
GK_ATOM(string, "string")
GK_ATOM(stringLength, "string-length")

4
dom/public/idl/css/nsIDOMCSS2Properties.idl
Просмотреть файл

@ -406,7 +406,7 @@ interface nsIDOMCSS2Properties : nsISupports
// raises(DOMException) on setting
};
[scriptable, uuid(c9339b8c-9bdd-4d2a-a61a-55ca609b92bd)]
[scriptable, uuid(8a5b178d-c805-4f8e-8992-fa7c5c11d08e)]
interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
{
/* Non-DOM 2 extensions */
@ -591,4 +591,6 @@ interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
attribute DOMString MozBorderStartWidth;
// raises(DOMException) on setting
attribute DOMString MozStackSizing;
// raises(DOMException) on setting
};

4
layout/base/nsStyleConsts.h
Просмотреть файл

@ -128,6 +128,10 @@
#define NS_STYLE_BOX_ORIENT_HORIZONTAL 0
#define NS_STYLE_BOX_ORIENT_VERTICAL 1
// stack-sizing
#define NS_STYLE_STACK_SIZING_IGNORE 0
#define NS_STYLE_STACK_SIZING_STRETCH_TO_FIT 1
// Azimuth - See nsStyleAural
#define NS_STYLE_AZIMUTH_LEFT_SIDE 0x00
#define NS_STYLE_AZIMUTH_FAR_LEFT 0x01

56
layout/reftests/bugs/346189-1-ref.xul Normal file
Просмотреть файл

@ -0,0 +1,56 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3c.org/1999/xhtml"
width="400"
height="600">
<vbox>
<hbox style="height: 20px;">
<spacer style="width: 100px; background: yellow;"/>
<spacer style="width: 100px; background: blue;"/>
<spacer style="width: 50px; background: yellow;"/>
<spacer style="width: 150px; background: green;"/>
</hbox>
<hbox style="height: 20px;">
<spacer style="width: 100px; background: yellow;"/>
<spacer style="width: 100px; background: blue;"/>
<spacer style="width: 50px; background: yellow;"/>
<spacer style="width: 150px; background: green;"/>
</hbox>
<hbox style="height: 20px;">
<spacer style="width: 100px; background: yellow;"/>
<spacer style="width: 100px; background: blue;"/>
<spacer style="width: 50px; background: yellow;"/>
<spacer style="width: 150px; background: green;"/>
</hbox>
<hbox style="height: 20px;">
<spacer style="width: 100px; background: yellow;"/>
<spacer style="width: 100px; background: blue;"/>
<spacer style="width: 200px; background: green;"/>
</hbox>
<hbox style="height: 20px;">
<spacer style="width: 100px; background: yellow;"/>
<spacer style="width: 300px; background: green;"/>
</hbox>
<hbox style="height: 20px;">
<spacer style="width: 200px; background: yellow;"/>
<spacer style="width: 200px; background: green;"/>
</hbox>
<hbox style="height: 20px;">
<spacer style="width: 100px; background: yellow;"/>
<spacer style="width: 300px; background: green;"/>
</hbox>
</vbox>
</window>

71
layout/reftests/bugs/346189-1.xul Normal file
Просмотреть файл

@ -0,0 +1,71 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
<window
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
xmlns:html="http://www.w3c.org/1999/xhtml"
width="400"
height="600">
<vbox style="max-width: 400px;">
<!-- default: the inner hbox should expand the stack. -->
<hbox style="height: 20px;">
<stack flex="1" style="background: yellow;">
<hbox style="width: 100px; height: 20px; background: blue;" top="0" left="100"/>
</stack>
<spacer flex="3" style="background: green;"/>
</hbox>
<!-- same as above, with explicit -moz-stack-sizing: stretch-to-fit -->
<hbox style="height: 20px;">
<stack flex="1" style="background: yellow;">
<hbox style="-moz-stack-sizing: stretch-to-fit; width: 100px; height: 20px; background: blue;" top="0" left="100"/>
</stack>
<spacer flex="3" style="background: green;"/>
</hbox>
<!-- same as above, but with overflow: hidden -->
<hbox style="height: 20px;">
<stack flex="1" style="overflow: hidden; background: yellow;">
<hbox style="-moz-stack-sizing: stretch-to-fit; width: 100px; height: 20px; background: blue;" top="0" left="100"/>
</stack>
<spacer flex="3" style="background: green; height: 20px;"/>
</hbox>
<!-- inner hbox has stack-sizing: ignore, but the stack doesn't have overflow: hidden set; the stack will stretch
just enough to include the child, but no more -->
<hbox style="height: 20px;">
<stack flex="1" style="background: yellow;">
<hbox style="-moz-stack-sizing: ignore; width: 100px; height: 20px; background: blue;" top="0" left="100"/>
</stack>
<spacer flex="3" style="background: green; height: 20px;"/>
</hbox>
<!-- same as above, except stack has overflow: hidden set, so the blue shouldn't be visible -->
<hbox style="height: 20px;">
<stack flex="1" style="overflow: hidden; background: yellow;">
<hbox style="-moz-stack-sizing: ignore; width: 100px; height: 20px; background: blue;" top="0" left="100"/>
</stack>
<spacer flex="3" style="background: green; height: 20px;"/>
</hbox>
<!-- no flex on the stack, but an explicit size; the child will cause us to resize the stack during Layout -->
<hbox style="height: 20px;">
<stack style="width: 100px; background: yellow;">
<hbox style="width: 100px; height: 20px; background: transparent;" top="0" left="100"/>
</stack>
<spacer flex="1" style="background: green;"/>
</hbox>
<!-- same as above, but with stack-sizing: ignore; the stack should not be resized -->
<hbox style="height: 20px;">
<stack style="width: 100px; background: yellow;">
<hbox style="-moz-stack-sizing: ignore; width: 100px; height: 20px; background: transparent;" top="0" left="100"/>
</stack>
<spacer flex="1" style="background: green;"/>
</hbox>
</vbox>
</window>

1
layout/reftests/bugs/reftest.list
Просмотреть файл

@ -301,6 +301,7 @@ random-if(MOZ_WIDGET_TOOLKIT=="gtk2") == 333970-1.html 333970-1-ref.html # bug 3
== 345267-1c.html 345267-1-ref.html
== 345267-1d.html 345267-1-ref.html
!= 345563-sub.xhtml 345563-sup.xhtml
== 346189-1.xul 346189-1-ref.xul
== 346774-1a.html 346774-1-ref.html
== 346774-1b.html 346774-1-ref.html
== 346774-1c.html 346774-1-ref.html

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

@ -418,6 +418,7 @@ CSS_KEY(start, start)
CSS_KEY(static, static)
CSS_KEY(status-bar, status_bar)
CSS_KEY(stretch, stretch)
CSS_KEY(stretch-to-fit, stretch_to_fit)
CSS_KEY(sub, sub)
CSS_KEY(super, super)
CSS_KEY(sw-resize, sw_resize)

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

@ -5070,6 +5070,9 @@ PRBool CSSParserImpl::ParseSingleValueProperty(nsresult& aErrorCode,
case eCSSProperty_speech_rate:
return ParseVariant(aErrorCode, aValue, VARIANT_HN | VARIANT_KEYWORD,
nsCSSProps::kSpeechRateKTable);
case eCSSProperty_stack_sizing:
return ParseVariant(aErrorCode, aValue, VARIANT_HK,
nsCSSProps::kStackSizingKTable);
case eCSSProperty_stress:
return ParseVariant(aErrorCode, aValue, VARIANT_HN, nsnull);
case eCSSProperty_table_layout:

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

@ -516,6 +516,7 @@ CSS_PROP_XUL(-moz-box-flex, box_flex, MozBoxFlex, XUL, mBoxFlex, eCSSType_Value,
CSS_PROP_XUL(-moz-box-orient, box_orient, MozBoxOrient, XUL, mBoxOrient, eCSSType_Value, kBoxOrientKTable) // XXX bug 3935
CSS_PROP_XUL(-moz-box-pack, box_pack, MozBoxPack, XUL, mBoxPack, eCSSType_Value, kBoxPackKTable) // XXX bug 3935
CSS_PROP_XUL(-moz-box-ordinal-group, box_ordinal_group, MozBoxOrdinalGroup, XUL, mBoxOrdinal, eCSSType_Value, nsnull)
CSS_PROP_XUL(-moz-stack-sizing, stack_sizing, MozStackSizing, XUL, mStackSizing, eCSSType_Value, kStackSizingKTable)
#ifdef MOZ_MATHML
#ifndef CSS_PROP_LIST_EXCLUDE_INTERNAL

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

@ -860,6 +860,12 @@ const PRInt32 nsCSSProps::kSpeechRateKTable[] = {
eCSSKeyword_UNKNOWN,-1
};
const PRInt32 nsCSSProps::kStackSizingKTable[] = {
eCSSKeyword_ignore, NS_STYLE_STACK_SIZING_IGNORE,
eCSSKeyword_stretch_to_fit, NS_STYLE_STACK_SIZING_STRETCH_TO_FIT,
eCSSKeyword_UNKNOWN,-1
};
const PRInt32 nsCSSProps::kTableLayoutKTable[] = {
eCSSKeyword_fixed, NS_STYLE_TABLE_LAYOUT_FIXED,
eCSSKeyword_UNKNOWN,-1

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

@ -177,6 +177,7 @@ public:
static const PRInt32 kSpeakNumeralKTable[];
static const PRInt32 kSpeakPunctuationKTable[];
static const PRInt32 kSpeechRateKTable[];
static const PRInt32 kStackSizingKTable[];
static const PRInt32 kTableLayoutKTable[];
static const PRInt32 kTextAlignKTable[];
static const PRInt32 kTextDecorationKTable[];

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

@ -548,6 +548,7 @@ struct nsCSSXUL : public nsCSSStruct {
nsCSSValue mBoxOrient;
nsCSSValue mBoxPack;
nsCSSValue mBoxOrdinal;
nsCSSValue mStackSizing;
private:
nsCSSXUL(const nsCSSXUL& aOther); // NOT IMPLEMENTED
};

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

@ -486,6 +486,18 @@ nsComputedDOMStyle::GetBottom(nsIDOMCSSValue** aValue)
return GetOffsetWidthFor(NS_SIDE_BOTTOM, aValue);
}
nsresult
nsComputedDOMStyle::GetStackSizing(nsIDOMCSSValue** aValue)
{
nsROCSSPrimitiveValue *val = GetROCSSPrimitiveValue();
NS_ENSURE_TRUE(val, NS_ERROR_OUT_OF_MEMORY);
val->SetIdent(GetStyleXUL()->mStretchStack ? nsGkAtoms::stretch_to_fit :
nsGkAtoms::ignore);
return CallQueryInterface(val, aValue);
}
nsresult
nsComputedDOMStyle::SetToRGBAColor(nsROCSSPrimitiveValue* aValue,
nscolor aColor)
@ -3806,6 +3818,7 @@ nsComputedDOMStyle::GetQueryablePropertyMap(PRUint32* aLength)
COMPUTED_STYLE_MAP_ENTRY(_moz_outline_radius_bottomRight,OutlineRadiusBottomRight),
COMPUTED_STYLE_MAP_ENTRY(_moz_outline_radius_topLeft, OutlineRadiusTopLeft),
COMPUTED_STYLE_MAP_ENTRY(_moz_outline_radius_topRight, OutlineRadiusTopRight),
COMPUTED_STYLE_MAP_ENTRY(stack_sizing, StackSizing),
COMPUTED_STYLE_MAP_ENTRY(user_focus, UserFocus),
COMPUTED_STYLE_MAP_ENTRY(user_input, UserInput),
COMPUTED_STYLE_MAP_ENTRY(user_modify, UserModify),

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

@ -133,6 +133,7 @@ private:
nsresult GetTop(nsIDOMCSSValue** aValue);
nsresult GetRight(nsIDOMCSSValue** aValue);
nsresult GetBottom(nsIDOMCSSValue** aValue);
nsresult GetStackSizing(nsIDOMCSSValue** aValue);
/* Font properties */
nsresult GetColor(nsIDOMCSSValue** aValue);

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

@ -4525,6 +4525,16 @@ nsRuleNode::ComputeXULData(void* aStartStruct,
xul->mBoxOrdinal = 1;
}
if (eCSSUnit_Inherit == xulData.mStackSizing.GetUnit()) {
inherited = PR_TRUE;
xul->mStretchStack = parentXUL->mStretchStack;
} else if (eCSSUnit_Initial == xulData.mStackSizing.GetUnit()) {
xul->mStretchStack = PR_TRUE;
} else if (eCSSUnit_Enumerated == xulData.mStackSizing.GetUnit()) {
xul->mStretchStack = xulData.mStackSizing.GetIntValue() ==
NS_STYLE_STACK_SIZING_STRETCH_TO_FIT;
}
COMPUTE_END_RESET(XUL, xul)
}

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

@ -573,6 +573,7 @@ nsStyleXUL::nsStyleXUL()
mBoxOrient = NS_STYLE_BOX_ORIENT_HORIZONTAL;
mBoxPack = NS_STYLE_BOX_PACK_START;
mBoxOrdinal = 1;
mStretchStack = PR_TRUE;
}
nsStyleXUL::~nsStyleXUL()

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

@ -1187,6 +1187,7 @@ struct nsStyleXUL {
PRUint8 mBoxDirection; // [reset] see nsStyleConsts.h
PRUint8 mBoxOrient; // [reset] see nsStyleConsts.h
PRUint8 mBoxPack; // [reset] see nsStyleConsts.h
PRPackedBool mStretchStack; // [reset] see nsStyleConsts.h
};
struct nsStyleColumn {

8
layout/style/test/property_database.js
Просмотреть файл

@ -442,6 +442,14 @@ var gCSSProperties = {
other_values: [ "1px", "3em" ],
invalid_values: []
},
"-moz-stack-sizing": {
domProp: "MozStackSizing",
inherited: false,
type: CSS_TYPE_LONGHAND,
initial_values: [ "stretch-to-fit" ],
other_values: [ "ignore" ],
invalid_values: []
},
"-moz-user-focus": {
domProp: "MozUserFocus",
inherited: true,

83
layout/xul/base/src/nsStackLayout.cpp
Просмотреть файл

@ -76,29 +76,35 @@ nsStackLayout::nsStackLayout()
{
}
/*
* Sizing: we are as wide as the widest child plus its left offset
* we are tall as the tallest child plus its top offset.
*
* Only children which have -moz-stack-sizing set to stretch-to-fit
* (the default) will be included in the size computations.
*/
nsSize
nsStackLayout::GetPrefSize(nsIBox* aBox, nsBoxLayoutState& aState)
{
nsSize rpref (0, 0);
// we are as wide as the widest child plus its left offset
// we are tall as the tallest child plus its top offset
nsSize prefSize (0, 0);
nsIBox* child = aBox->GetChildBox();
while (child) {
nsSize pref = child->GetPrefSize(aState);
while (child) {
if (child->GetStyleXUL()->mStretchStack) {
nsSize pref = child->GetPrefSize(aState);
AddMargin(child, pref);
AddOffset(aState, child, pref);
AddLargestSize(rpref, pref);
AddMargin(child, pref);
AddOffset(aState, child, pref);
AddLargestSize(prefSize, pref);
}
child = child->GetNextBox();
}
// now add our border and padding
AddBorderAndPadding(aBox, rpref);
AddBorderAndPadding(aBox, prefSize);
return rpref;
return prefSize;
}
nsSize
@ -106,19 +112,19 @@ nsStackLayout::GetMinSize(nsIBox* aBox, nsBoxLayoutState& aState)
{
nsSize minSize (0, 0);
// run through all the children and get their min, max, and preferred sizes
nsIBox* child = aBox->GetChildBox();
while (child) {
nsSize min = child->GetMinSize(aState);
AddMargin(child, min);
AddOffset(aState, child, min);
AddLargestSize(minSize, min);
while (child) {
if (child->GetStyleXUL()->mStretchStack) {
nsSize min = child->GetMinSize(aState);
AddMargin(child, min);
AddOffset(aState, child, min);
AddLargestSize(minSize, min);
}
child = child->GetNextBox();
}
// now add our border and padding
AddBorderAndPadding(aBox, minSize);
return minSize;
@ -129,21 +135,22 @@ nsStackLayout::GetMaxSize(nsIBox* aBox, nsBoxLayoutState& aState)
{
nsSize maxSize (NS_INTRINSICSIZE, NS_INTRINSICSIZE);
// run through all the children and get their min, max, and preferred sizes
nsIBox* child = aBox->GetChildBox();
while (child) {
nsSize min = child->GetMinSize(aState);
nsSize max = nsBox::BoundsCheckMinMax(min, child->GetMaxSize(aState));
while (child) {
if (child->GetStyleXUL()->mStretchStack) {
nsSize min = child->GetMinSize(aState);
nsSize max = child->GetMaxSize(aState);
AddMargin(child, max);
AddOffset(aState, child, max);
AddSmallestSize(maxSize, max);
max = nsBox::BoundsCheckMinMax(min, max);
AddMargin(child, max);
AddOffset(aState, child, max);
AddSmallestSize(maxSize, max);
}
child = child->GetNextBox();
}
// now add our border and padding
AddBorderAndPadding(aBox, maxSize);
return maxSize;
@ -292,15 +299,17 @@ nsStackLayout::Layout(nsIBox* aBox, nsBoxLayoutState& aState)
childRectNoMargin = childRect = child->GetRect();
childRect.Inflate(margin);
// Did the child push back on us and get bigger?
if (offset.width + childRect.width > clientRect.width) {
clientRect.width = childRect.width + offset.width;
grow = PR_TRUE;
}
if (child->GetStyleXUL()->mStretchStack) {
// Did the child push back on us and get bigger?
if (offset.width + childRect.width > clientRect.width) {
clientRect.width = childRect.width + offset.width;
grow = PR_TRUE;
}
if (offset.height + childRect.height > clientRect.height) {
clientRect.height = childRect.height + offset.height;
grow = PR_TRUE;
if (offset.height + childRect.height > clientRect.height) {
clientRect.height = childRect.height + offset.height;
grow = PR_TRUE;
}
}
if (childRectNoMargin != oldRect)