mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 838256, part 2 - Overhaul and complete the layout pieces for <input type=range>. r=dholbert for the combined diff with the previous changeset.
This commit is contained in:
Jonathan Watt
parent
e38c741da9
commit
9a999c1cb4
@ -1798,6 +1798,7 @@ GK_ATOM(pageContentFrame, "PageContentFrame")
|
||||
GK_ATOM(placeholderFrame, "PlaceholderFrame")
|
||||
GK_ATOM(popupSetFrame, "PopupSetFrame")
|
||||
GK_ATOM(canvasFrame, "CanvasFrame")
|
||||
GK_ATOM(rangeFrame, "RangeFrame")
|
||||
GK_ATOM(rootFrame, "RootFrame")
|
||||
GK_ATOM(scrollFrame, "ScrollFrame")
|
||||
GK_ATOM(scrollbarFrame, "ScrollbarFrame")
|
||||
|
||||
@ -1488,69 +1488,6 @@ nsHTMLInputElement::SetValueAsNumber(double aValueAsNumber)
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
double
|
||||
nsHTMLInputElement::GetPositionAsPercent()
|
||||
{
|
||||
// Should only be used for <input type='range'> for the moment.
|
||||
MOZ_ASSERT(mType == NS_FORM_INPUT_RANGE);
|
||||
|
||||
double minimum = GetMinimum();
|
||||
if (MOZ_DOUBLE_IS_NaN(minimum)) {
|
||||
return MOZ_DOUBLE_NaN();
|
||||
}
|
||||
|
||||
double maximum = GetMaximum();
|
||||
if (MOZ_DOUBLE_IS_NaN(maximum)) {
|
||||
return MOZ_DOUBLE_NaN();
|
||||
}
|
||||
|
||||
double value = GetValueAsDouble();
|
||||
if (MOZ_DOUBLE_IS_NaN(value)) {
|
||||
return MOZ_DOUBLE_NaN();
|
||||
}
|
||||
|
||||
return (value - minimum) / (maximum - minimum);
|
||||
}
|
||||
|
||||
void
|
||||
nsHTMLInputElement::SetPositionAsPercent(double position)
|
||||
{
|
||||
// TODO: datalist support
|
||||
|
||||
double minimum = GetMinimum();
|
||||
if (MOZ_DOUBLE_IS_NaN(minimum)) {
|
||||
return;
|
||||
}
|
||||
|
||||
double maximum = GetMaximum();
|
||||
if (MOZ_DOUBLE_IS_NaN(maximum)) {
|
||||
return;
|
||||
}
|
||||
|
||||
double currentValue = GetValueAsDouble();
|
||||
if (MOZ_DOUBLE_IS_NaN(currentValue)) {
|
||||
return;
|
||||
}
|
||||
|
||||
double val = (maximum - minimum)*position + minimum;
|
||||
if (DoesStepApply()) {
|
||||
double increment = GetStep();
|
||||
val = minimum + NSToIntRound(val / float(increment)) * increment;
|
||||
}
|
||||
|
||||
// get the new position and make sure it is in bounds
|
||||
if (val < minimum || maximum < minimum)
|
||||
val = minimum;
|
||||
else if (val > maximum)
|
||||
val = maximum;
|
||||
|
||||
if (val == currentValue)
|
||||
return;
|
||||
|
||||
SetValue(val);
|
||||
FireChangeEventIfNeeded();
|
||||
}
|
||||
|
||||
double
|
||||
nsHTMLInputElement::GetMinimum() const
|
||||
{
|
||||
|
||||
@ -283,6 +283,14 @@ public:
|
||||
*/
|
||||
void FireChangeEventIfNeeded();
|
||||
|
||||
/**
|
||||
* Returns the input element's value as a double-precision float.
|
||||
* Returns NaN if the current element's value is not a floating point number.
|
||||
*
|
||||
* @return the input element's value as a double-precision float.
|
||||
*/
|
||||
double GetValueAsDouble() const;
|
||||
|
||||
/**
|
||||
* Returns the input's "minimum" (as defined by the HTML5 spec) as a double.
|
||||
* Note this takes account of any default minimum that the type may have.
|
||||
@ -303,18 +311,6 @@ public:
|
||||
*/
|
||||
double GetMaximum() const;
|
||||
|
||||
/**
|
||||
* Returns the input element's value as a double-precision float.
|
||||
* Returns NaN if the current element's value is not a floating point number.
|
||||
*
|
||||
* @return the input element's value as a double-precision float.
|
||||
*/
|
||||
double GetValueAsDouble() const;
|
||||
|
||||
double GetPositionAsPercent();
|
||||
|
||||
void SetPositionAsPercent(double position);
|
||||
|
||||
protected:
|
||||
// Pull IsSingleLineTextControl into our scope, otherwise it'd be hidden
|
||||
// by the nsITextControlElement version.
|
||||
|
||||
@ -5,34 +5,27 @@
|
||||
|
||||
#include "nsRangeFrame.h"
|
||||
|
||||
#include "nsHTMLInputElement.h"
|
||||
#include "nsIDOMHTMLInputElement.h"
|
||||
#include "nsIContent.h"
|
||||
#include "prtypes.h"
|
||||
#include "nsPresContext.h"
|
||||
#include "nsGkAtoms.h"
|
||||
#include "nsINameSpaceManager.h"
|
||||
#include "nsIDocument.h"
|
||||
#include "nsIPresShell.h"
|
||||
#include "nsNodeInfoManager.h"
|
||||
#include "nsINodeInfo.h"
|
||||
#include "nsContentCreatorFunctions.h"
|
||||
#include "nsContentList.h"
|
||||
#include "nsContentUtils.h"
|
||||
#include "nsFormControlFrame.h"
|
||||
#include "nsContentList.h"
|
||||
#include "nsFontMetrics.h"
|
||||
#include "nsFormControlFrame.h"
|
||||
#include "nsIContent.h"
|
||||
#include "nsIDocument.h"
|
||||
#include "nsIDOMHTMLInputElement.h"
|
||||
#include "nsINameSpaceManager.h"
|
||||
#include "nsINodeInfo.h"
|
||||
#include "nsIPresShell.h"
|
||||
#include "nsGkAtoms.h"
|
||||
#include "nsHTMLInputElement.h"
|
||||
#include "nsPresContext.h"
|
||||
#include "nsNodeInfoManager.h"
|
||||
#include "mozilla/dom/Element.h"
|
||||
#include "nsContentList.h"
|
||||
#include "prtypes.h"
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRangeFrame::SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList)
|
||||
{
|
||||
nsresult rv = nsContainerFrame::SetInitialChildList(aListID, aChildList);
|
||||
return rv;
|
||||
}
|
||||
#define LONG_SIDE_TO_SHORT_SIDE_RATIO 10
|
||||
|
||||
nsIFrame*
|
||||
NS_NewRangeFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
|
||||
@ -40,12 +33,8 @@ NS_NewRangeFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
|
||||
return new (aPresShell) nsRangeFrame(aContext);
|
||||
}
|
||||
|
||||
NS_IMPL_FRAMEARENA_HELPERS(nsRangeFrame)
|
||||
|
||||
nsRangeFrame::nsRangeFrame(nsStyleContext* aContext)
|
||||
: nsContainerFrame(aContext)
|
||||
, mThumbDiv(nullptr)
|
||||
, mProgressDiv(nullptr)
|
||||
{
|
||||
}
|
||||
|
||||
@ -53,54 +42,68 @@ nsRangeFrame::~nsRangeFrame()
|
||||
{
|
||||
}
|
||||
|
||||
NS_IMPL_FRAMEARENA_HELPERS(nsRangeFrame)
|
||||
|
||||
NS_QUERYFRAME_HEAD(nsRangeFrame)
|
||||
NS_QUERYFRAME_ENTRY(nsRangeFrame)
|
||||
NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator)
|
||||
NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame)
|
||||
|
||||
void
|
||||
nsRangeFrame::DestroyFrom(nsIFrame* aDestructRoot)
|
||||
{
|
||||
NS_ASSERTION(!GetPrevContinuation(),
|
||||
NS_ASSERTION(!GetPrevContinuation() && !GetNextContinuation(),
|
||||
"nsRangeFrame should not have continuations; if it does we "
|
||||
"need to call RegUnregAccessKey only for the first.");
|
||||
nsFormControlFrame::RegUnRegAccessKey(static_cast<nsIFrame*>(this), false);
|
||||
nsContentUtils::DestroyAnonymousContent(&mTrackDiv);
|
||||
nsContentUtils::DestroyAnonymousContent(&mThumbDiv);
|
||||
nsContentUtils::DestroyAnonymousContent(&mProgressDiv);
|
||||
nsContainerFrame::DestroyFrom(aDestructRoot);
|
||||
}
|
||||
|
||||
nsresult
|
||||
nsRangeFrame::CreateAnonymousContent(nsTArray<ContentInfo>& aElements)
|
||||
{
|
||||
// Get the NodeInfoManager and tag necessary to create the progress bar div.
|
||||
// Get the NodeInfoManager and tag necessary to create the anonymous divs.
|
||||
nsCOMPtr<nsIDocument> doc = mContent->GetDocument();
|
||||
|
||||
// Create the track div:
|
||||
nsCOMPtr<nsINodeInfo> nodeInfo;
|
||||
nodeInfo = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::div, nullptr,
|
||||
kNameSpaceID_XHTML,
|
||||
nsIDOMNode::ELEMENT_NODE);
|
||||
NS_ENSURE_TRUE(nodeInfo, NS_ERROR_OUT_OF_MEMORY);
|
||||
|
||||
// Create the div.
|
||||
nodeInfo = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::div, nullptr,
|
||||
kNameSpaceID_XHTML,
|
||||
nsIDOMNode::ELEMENT_NODE);
|
||||
nsresult rv = NS_NewHTMLElement(getter_AddRefs(mThumbDiv), nodeInfo.forget(),
|
||||
mozilla::dom::NOT_FROM_PARSER);
|
||||
nsresult rv = NS_NewHTMLElement(getter_AddRefs(mTrackDiv), nodeInfo.forget(),
|
||||
mozilla::dom::NOT_FROM_PARSER);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
nsCSSPseudoElements::Type pseudoType = nsCSSPseudoElements::ePseudo_mozRangeThumb;
|
||||
nsRefPtr<nsStyleContext> newStyleContext = PresContext()->StyleSet()->
|
||||
ResolvePseudoElementStyle(mContent->AsElement(), pseudoType, GetStyleContext());
|
||||
// Associate ::-moz-range-track pseudo-element to the anonymous child.
|
||||
nsCSSPseudoElements::Type pseudoType =
|
||||
nsCSSPseudoElements::ePseudo_mozRangeTrack;
|
||||
nsRefPtr<nsStyleContext> newStyleContext =
|
||||
PresContext()->StyleSet()->ResolvePseudoElementStyle(mContent->AsElement(),
|
||||
pseudoType,
|
||||
StyleContext());
|
||||
|
||||
if (!aElements.AppendElement(ContentInfo(mThumbDiv, newStyleContext))) {
|
||||
if (!aElements.AppendElement(ContentInfo(mTrackDiv, newStyleContext))) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
// Progress div
|
||||
rv = NS_NewHTMLElement(getter_AddRefs(mProgressDiv), nodeInfo.forget(),
|
||||
// Create the thumb div:
|
||||
nodeInfo = doc->NodeInfoManager()->GetNodeInfo(nsGkAtoms::div, nullptr,
|
||||
kNameSpaceID_XHTML,
|
||||
nsIDOMNode::ELEMENT_NODE);
|
||||
NS_ENSURE_TRUE(nodeInfo, NS_ERROR_OUT_OF_MEMORY);
|
||||
rv = NS_NewHTMLElement(getter_AddRefs(mThumbDiv), nodeInfo.forget(),
|
||||
mozilla::dom::NOT_FROM_PARSER);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
pseudoType = nsCSSPseudoElements::ePseudo_mozRangeActive;
|
||||
newStyleContext = PresContext()->StyleSet()->
|
||||
ResolvePseudoElementStyle(mContent->AsElement(), pseudoType, GetStyleContext());
|
||||
// Associate ::-moz-range-thumb pseudo-element to the anonymous child.
|
||||
pseudoType = nsCSSPseudoElements::ePseudo_mozRangeThumb;
|
||||
newStyleContext =
|
||||
PresContext()->StyleSet()->ResolvePseudoElementStyle(mContent->AsElement(),
|
||||
pseudoType,
|
||||
StyleContext());
|
||||
|
||||
if (!aElements.AppendElement(ContentInfo(mProgressDiv, newStyleContext))) {
|
||||
if (!aElements.AppendElement(ContentInfo(mThumbDiv, newStyleContext))) {
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
}
|
||||
|
||||
@ -111,34 +114,30 @@ void
|
||||
nsRangeFrame::AppendAnonymousContentTo(nsBaseContentList& aElements,
|
||||
uint32_t aFilter)
|
||||
{
|
||||
aElements.MaybeAppendElement(mTrackDiv);
|
||||
aElements.MaybeAppendElement(mThumbDiv);
|
||||
aElements.MaybeAppendElement(mProgressDiv);
|
||||
}
|
||||
|
||||
NS_QUERYFRAME_HEAD(nsRangeFrame)
|
||||
NS_QUERYFRAME_ENTRY(nsRangeFrame)
|
||||
NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator)
|
||||
NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame)
|
||||
|
||||
void
|
||||
nsRangeFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists)
|
||||
{
|
||||
BuildDisplayListForInline(aBuilder, aDirtyRect, aLists);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRangeFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists)
|
||||
{
|
||||
return BuildDisplayListForInline(aBuilder, aDirtyRect, aLists);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsRangeFrame::Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus)
|
||||
nsRangeFrame::Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus)
|
||||
{
|
||||
DO_GLOBAL_REFLOW_COUNT("nsRangeFrame");
|
||||
DISPLAY_REFLOW(aPresContext, this, aReflowState, aDesiredSize, aStatus);
|
||||
|
||||
NS_ASSERTION(mTrackDiv, "Track div must exist!");
|
||||
NS_ASSERTION(mThumbDiv, "Thumb div must exist!");
|
||||
NS_ASSERTION(!GetPrevContinuation(),
|
||||
NS_ASSERTION(!GetPrevContinuation() && !GetNextContinuation(),
|
||||
"nsRangeFrame should not have continuations; if it does we "
|
||||
"need to call RegUnregAccessKey only for the first.");
|
||||
|
||||
@ -146,22 +145,33 @@ NS_IMETHODIMP nsRangeFrame::Reflow(nsPresContext* aPresContext,
|
||||
nsFormControlFrame::RegUnRegAccessKey(this, true);
|
||||
}
|
||||
|
||||
nscoord computedHeight = aReflowState.ComputedHeight();
|
||||
if (computedHeight == NS_AUTOHEIGHT) {
|
||||
computedHeight = 0;
|
||||
}
|
||||
aDesiredSize.width = aReflowState.ComputedWidth() +
|
||||
aReflowState.mComputedBorderPadding.LeftRight();
|
||||
aDesiredSize.height = aReflowState.ComputedHeight() +
|
||||
aDesiredSize.height = computedHeight +
|
||||
aReflowState.mComputedBorderPadding.TopBottom();
|
||||
|
||||
aDesiredSize.SetOverflowAreasToDesiredBounds();
|
||||
nsIFrame* barFrame = mThumbDiv->GetPrimaryFrame();
|
||||
ConsiderChildOverflow(aDesiredSize.mOverflowAreas, barFrame);
|
||||
nsresult rv =
|
||||
ReflowAnonymousContent(aPresContext, aDesiredSize, aReflowState);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
||||
nsIFrame* progressFrame = mProgressDiv->GetPrimaryFrame();
|
||||
ConsiderChildOverflow(aDesiredSize.mOverflowAreas, progressFrame);
|
||||
aDesiredSize.SetOverflowAreasToDesiredBounds();
|
||||
|
||||
nsIFrame* trackFrame = mTrackDiv->GetPrimaryFrame();
|
||||
if (trackFrame) {
|
||||
ConsiderChildOverflow(aDesiredSize.mOverflowAreas, trackFrame);
|
||||
}
|
||||
|
||||
nsIFrame* thumbFrame = mThumbDiv->GetPrimaryFrame();
|
||||
if (thumbFrame) {
|
||||
ConsiderChildOverflow(aDesiredSize.mOverflowAreas, thumbFrame);
|
||||
}
|
||||
|
||||
FinishAndStoreOverflow(&aDesiredSize);
|
||||
|
||||
ReflowBarFrame(aPresContext, aReflowState, aStatus);
|
||||
|
||||
aStatus = NS_FRAME_COMPLETE;
|
||||
|
||||
NS_FRAME_SET_TRUNCATION(aStatus, aReflowState, aDesiredSize);
|
||||
@ -169,113 +179,181 @@ NS_IMETHODIMP nsRangeFrame::Reflow(nsPresContext* aPresContext,
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
void
|
||||
nsRangeFrame::ReflowBarFrame(nsPresContext* aPresContext,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus)
|
||||
nsresult
|
||||
nsRangeFrame::ReflowAnonymousContent(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState)
|
||||
{
|
||||
nsIFrame* barFrame = mThumbDiv->GetPrimaryFrame();
|
||||
NS_ASSERTION(barFrame, "The range frame should have a child with a frame!");
|
||||
|
||||
nsIFrame* progressFrame = mProgressDiv->GetPrimaryFrame();
|
||||
NS_ASSERTION(progressFrame, "The range frame should have a child with a frame!");
|
||||
|
||||
bool vertical = !IsHorizontal(aReflowState.ComputedWidth(), aReflowState.ComputedHeight());
|
||||
nsHTMLReflowState barReflowState(aPresContext, aReflowState, barFrame,
|
||||
nsSize(aReflowState.ComputedWidth(),
|
||||
NS_UNCONSTRAINEDSIZE));
|
||||
nsHTMLReflowState progressReflowState(aPresContext, aReflowState, progressFrame,
|
||||
nsSize(aReflowState.ComputedWidth(),
|
||||
NS_UNCONSTRAINEDSIZE));
|
||||
|
||||
nscoord parentHeight = aReflowState.ComputedHeight() + aReflowState.mComputedBorderPadding.TopBottom();
|
||||
nscoord parentWidth = aReflowState.ComputedWidth() + aReflowState.mComputedBorderPadding.LeftRight();
|
||||
|
||||
nscoord size = vertical ? aReflowState.ComputedHeight() : aReflowState.ComputedWidth();
|
||||
nscoord progressSize = size;
|
||||
|
||||
nsSize thumbSize = barFrame->GetSize();
|
||||
size -= vertical ? thumbSize.height : thumbSize.width;
|
||||
|
||||
nscoord xoffset = vertical ? 0 : aReflowState.mComputedBorderPadding.left;
|
||||
nscoord yoffset = vertical ? aReflowState.mComputedBorderPadding.top : 0;
|
||||
nscoord xProgressOffset = 0;
|
||||
nscoord yProgressOffset = 0;
|
||||
|
||||
// center the thumb in the box
|
||||
xoffset += vertical ? (parentWidth - barReflowState.ComputedWidth()) / 2 : 0;
|
||||
yoffset += vertical ? 0 : (parentHeight - barReflowState.ComputedHeight()) / 2;
|
||||
|
||||
nsHTMLInputElement* element = static_cast<nsHTMLInputElement*>(mContent);
|
||||
double position = element->GetPositionAsPercent();
|
||||
|
||||
if (position >= 0.0) {
|
||||
size *= vertical ? (1 - position) : position;
|
||||
progressSize *= vertical ? (1 - position) : position;
|
||||
if (ShouldUseNativeStyle()) {
|
||||
return NS_OK; // No need to reflow since we're not using these frames
|
||||
}
|
||||
|
||||
if (!vertical && GetStyleVisibility()->mDirection == NS_STYLE_DIRECTION_RTL) {
|
||||
xoffset += parentWidth - size;
|
||||
xProgressOffset += parentWidth - progressSize;
|
||||
// The width/height of our content box, which is the available width/height
|
||||
// for our anonymous content:
|
||||
nscoord rangeFrameContentBoxWidth = aReflowState.ComputedWidth();
|
||||
nscoord rangeFrameContentBoxHeight = aReflowState.ComputedHeight();
|
||||
if (rangeFrameContentBoxHeight == NS_AUTOHEIGHT) {
|
||||
rangeFrameContentBoxHeight = 0;
|
||||
}
|
||||
|
||||
if (position != -1 || ShouldUseNativeStyle()) {
|
||||
if (vertical) {
|
||||
size -= barReflowState.mComputedMargin.TopBottom() +
|
||||
barReflowState.mComputedBorderPadding.TopBottom();
|
||||
size = std::max(size, 0);
|
||||
yoffset += size;
|
||||
yProgressOffset = yoffset;
|
||||
nsIFrame* trackFrame = mTrackDiv->GetPrimaryFrame();
|
||||
|
||||
progressSize = parentHeight - yoffset;
|
||||
progressSize = std::max(progressSize, 0);
|
||||
progressReflowState.SetComputedHeight(progressSize);
|
||||
progressReflowState.SetComputedWidth(parentWidth);
|
||||
if (trackFrame) { // display:none?
|
||||
|
||||
// Position the track:
|
||||
// The idea here is that we allow content authors to style the width,
|
||||
// height, border and padding of the track, but we ignore margin and
|
||||
// positioning properties and do the positioning ourself to keep the center
|
||||
// of the track's border box on the center of the nsRangeFrame's content
|
||||
// box.
|
||||
|
||||
nsHTMLReflowState trackReflowState(aPresContext, aReflowState, trackFrame,
|
||||
nsSize(aReflowState.ComputedWidth(),
|
||||
NS_UNCONSTRAINEDSIZE));
|
||||
|
||||
// Find the x/y position of the track frame such that it will be positioned
|
||||
// as described above. These coordinates are with respect to the
|
||||
// nsRangeFrame's border-box.
|
||||
nscoord trackX = rangeFrameContentBoxWidth / 2;
|
||||
nscoord trackY = rangeFrameContentBoxHeight / 2;
|
||||
|
||||
// Account for the track's border and padding (we ignore its margin):
|
||||
trackX -= trackReflowState.mComputedBorderPadding.left +
|
||||
trackReflowState.ComputedWidth() / 2;
|
||||
trackY -= trackReflowState.mComputedBorderPadding.top +
|
||||
trackReflowState.ComputedHeight() / 2;
|
||||
|
||||
// Make relative to our border box instead of our content box:
|
||||
trackX += aReflowState.mComputedBorderPadding.left;
|
||||
trackY += aReflowState.mComputedBorderPadding.top;
|
||||
|
||||
nsReflowStatus frameStatus = NS_FRAME_COMPLETE;
|
||||
nsHTMLReflowMetrics trackDesiredSize;
|
||||
nsresult rv = ReflowChild(trackFrame, aPresContext, trackDesiredSize,
|
||||
trackReflowState, trackX, trackY, 0, frameStatus);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(frameStatus),
|
||||
"We gave our child unconstrained height, so it should be complete");
|
||||
rv = FinishReflowChild(trackFrame, aPresContext, &trackReflowState,
|
||||
trackDesiredSize, trackX, trackY, 0);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
|
||||
nsIFrame* thumbFrame = mThumbDiv->GetPrimaryFrame();
|
||||
|
||||
if (thumbFrame) { // display:none?
|
||||
|
||||
// Position the thumb:
|
||||
// The idea here is that we want to position the thumb so that the center
|
||||
// of the thumb is on an imaginary line drawn from the middle of one edge
|
||||
// of the range frame's content box to the middle of the opposite edge of
|
||||
// its content box (the opposite edges being the left/right edge if the
|
||||
// range is horizontal, or else the top/bottom edges if the range is
|
||||
// vertical). How far along this line the center of the thumb is placed
|
||||
// depends on the value of the range.
|
||||
|
||||
nsSize frameSizeOverride(aDesiredSize.width, aDesiredSize.height);
|
||||
bool isHorizontal = IsHorizontal(&frameSizeOverride);
|
||||
|
||||
double valueAsFraction = GetValueAsFractionOfRange();
|
||||
MOZ_ASSERT(valueAsFraction >= 0.0 && valueAsFraction <= 1.0);
|
||||
|
||||
nsHTMLReflowState thumbReflowState(aPresContext, aReflowState, thumbFrame,
|
||||
nsSize(aReflowState.ComputedWidth(),
|
||||
NS_UNCONSTRAINEDSIZE));
|
||||
|
||||
// Find the x/y position of the thumb frame such that it will be positioned
|
||||
// as described above. These coordinates are with respect to the
|
||||
// nsRangeFrame's border-box.
|
||||
nscoord thumbX, thumbY;
|
||||
|
||||
if (isHorizontal) {
|
||||
thumbX = NSToCoordRound(rangeFrameContentBoxWidth * valueAsFraction);
|
||||
thumbY = rangeFrameContentBoxHeight / 2;
|
||||
} else {
|
||||
size -= barReflowState.mComputedMargin.LeftRight() +
|
||||
barReflowState.mComputedBorderPadding.LeftRight();
|
||||
size = std::max(size, 0);
|
||||
xoffset += size;
|
||||
|
||||
progressReflowState.SetComputedWidth(xoffset + thumbSize.width);
|
||||
progressReflowState.SetComputedHeight(parentHeight);
|
||||
thumbX = rangeFrameContentBoxWidth / 2;
|
||||
// For vertical range zero is at the bottom, so subtract from height:
|
||||
thumbY = rangeFrameContentBoxHeight -
|
||||
NSToCoordRound(rangeFrameContentBoxHeight * valueAsFraction);
|
||||
}
|
||||
} else if (vertical) {
|
||||
yoffset += parentHeight - barReflowState.ComputedHeight();
|
||||
yProgressOffset += parentHeight - progressReflowState.ComputedHeight();
|
||||
|
||||
thumbX -= thumbReflowState.mComputedBorderPadding.left +
|
||||
thumbReflowState.ComputedWidth() / 2;
|
||||
thumbY -= thumbReflowState.mComputedBorderPadding.top +
|
||||
thumbReflowState.ComputedHeight() / 2;
|
||||
|
||||
// Make relative to our border box instead of our content box:
|
||||
thumbX += aReflowState.mComputedBorderPadding.left;
|
||||
thumbY += aReflowState.mComputedBorderPadding.top;
|
||||
|
||||
nsReflowStatus frameStatus = NS_FRAME_COMPLETE;
|
||||
nsHTMLReflowMetrics thumbDesiredSize;
|
||||
nsresult rv = ReflowChild(thumbFrame, aPresContext, thumbDesiredSize,
|
||||
thumbReflowState, thumbX, thumbY, 0, frameStatus);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
MOZ_ASSERT(NS_FRAME_IS_FULLY_COMPLETE(frameStatus),
|
||||
"We gave our child unconstrained height, so it should be complete");
|
||||
rv = FinishReflowChild(thumbFrame, aPresContext, &thumbReflowState,
|
||||
thumbDesiredSize, thumbX, thumbY, 0);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
}
|
||||
|
||||
nsHTMLReflowMetrics barDesiredSize;
|
||||
ReflowChild(barFrame, aPresContext, barDesiredSize, barReflowState, xoffset, yoffset, 0, aStatus);
|
||||
FinishReflowChild(barFrame, aPresContext, &barReflowState, barDesiredSize, xoffset, yoffset, 0);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
nsHTMLReflowMetrics progressDesiredSize;
|
||||
ReflowChild(progressFrame, aPresContext, progressDesiredSize, progressReflowState, 0,
|
||||
xProgressOffset, yProgressOffset, aStatus);
|
||||
FinishReflowChild(progressFrame, aPresContext, &progressReflowState, progressDesiredSize,
|
||||
xProgressOffset, yProgressOffset, 0);}
|
||||
double
|
||||
nsRangeFrame::GetValueAsFractionOfRange()
|
||||
{
|
||||
MOZ_ASSERT(mContent->IsHTML(nsGkAtoms::input), "bad cast");
|
||||
nsHTMLInputElement* input = static_cast<nsHTMLInputElement*>(mContent);
|
||||
|
||||
MOZ_ASSERT(input->GetType() == NS_FORM_INPUT_RANGE);
|
||||
|
||||
double value = input->GetValueAsDouble();
|
||||
double minimum = input->GetMinimum();
|
||||
double maximum = input->GetMaximum();
|
||||
|
||||
MOZ_ASSERT(MOZ_DOUBLE_IS_FINITE(value) &&
|
||||
MOZ_DOUBLE_IS_FINITE(minimum) &&
|
||||
MOZ_DOUBLE_IS_FINITE(maximum),
|
||||
"type=range should have a default maximum/minimum");
|
||||
|
||||
if (maximum <= minimum) {
|
||||
MOZ_ASSERT(value == minimum, "Unsanitized value");
|
||||
return 0.0;
|
||||
}
|
||||
|
||||
MOZ_ASSERT(value >= minimum && value <= maximum, "Unsanitized value");
|
||||
|
||||
return (value - minimum) / (maximum - minimum);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsRangeFrame::AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType)
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType)
|
||||
{
|
||||
NS_ASSERTION(mThumbDiv, "Thumb div must exist!");
|
||||
NS_ASSERTION(mProgressDiv, "Progress div must exist!");
|
||||
NS_ASSERTION(mTrackDiv, "The track div must exist!");
|
||||
NS_ASSERTION(mThumbDiv, "The thumb div must exist!");
|
||||
|
||||
if (aNameSpaceID == kNameSpaceID_None &&
|
||||
(aAttribute == nsGkAtoms::value || aAttribute == nsGkAtoms::max)) {
|
||||
nsIFrame* barFrame = mThumbDiv->GetPrimaryFrame();
|
||||
NS_ASSERTION(barFrame, "The range frame should have a child with a frame!");
|
||||
PresContext()->PresShell()->FrameNeedsReflow(barFrame, nsIPresShell::eResize,
|
||||
NS_FRAME_IS_DIRTY);
|
||||
(aAttribute == nsGkAtoms::value ||
|
||||
aAttribute == nsGkAtoms::min ||
|
||||
aAttribute == nsGkAtoms::max ||
|
||||
aAttribute == nsGkAtoms::step)) {
|
||||
nsIFrame* trackFrame = mTrackDiv->GetPrimaryFrame();
|
||||
if (trackFrame) { // diplay:none?
|
||||
PresContext()->PresShell()->FrameNeedsReflow(trackFrame,
|
||||
nsIPresShell::eResize,
|
||||
NS_FRAME_IS_DIRTY);
|
||||
}
|
||||
|
||||
nsIFrame* progressFrame = mProgressDiv->GetPrimaryFrame();
|
||||
NS_ASSERTION(progressFrame, "The range frame should have a child with a frame!");
|
||||
PresContext()->PresShell()->FrameNeedsReflow(progressFrame, nsIPresShell::eResize,
|
||||
NS_FRAME_IS_DIRTY);
|
||||
|
||||
InvalidateFrame();
|
||||
nsIFrame* thumbFrame = mThumbDiv->GetPrimaryFrame();
|
||||
if (thumbFrame) { // diplay:none?
|
||||
PresContext()->PresShell()->FrameNeedsReflow(thumbFrame,
|
||||
nsIPresShell::eResize,
|
||||
NS_FRAME_IS_DIRTY);
|
||||
}
|
||||
}
|
||||
|
||||
return nsContainerFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType);
|
||||
@ -283,24 +361,32 @@ nsRangeFrame::AttributeChanged(int32_t aNameSpaceID,
|
||||
|
||||
nsSize
|
||||
nsRangeFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
nsSize aMargin, nsSize aBorder,
|
||||
nsSize aPadding, bool aShrinkWrap)
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
nsSize aMargin, nsSize aBorder,
|
||||
nsSize aPadding, bool aShrinkWrap)
|
||||
{
|
||||
float inflation = nsLayoutUtils::FontSizeInflationFor(this);
|
||||
nsRefPtr<nsFontMetrics> fontMet;
|
||||
NS_ENSURE_SUCCESS(nsLayoutUtils::GetFontMetricsForFrame(this,
|
||||
getter_AddRefs(fontMet),
|
||||
inflation),
|
||||
nsSize(0, 0));
|
||||
nscoord oneEm = NSToCoordRound(GetStyleFont()->mFont.size *
|
||||
nsLayoutUtils::FontSizeInflationFor(this)); // 1em
|
||||
|
||||
// frameSizeOverride values just gets us to fall back to being horizontal
|
||||
// (the actual values are irrelevant, as long as width > height):
|
||||
nsSize frameSizeOverride(10,1);
|
||||
bool isHorizontal = IsHorizontal(&frameSizeOverride);
|
||||
|
||||
nsSize autoSize;
|
||||
autoSize.height = autoSize.width = fontMet->Font().size; // 1em
|
||||
|
||||
if (IsHorizontal(autoSize.width, autoSize.height)) {
|
||||
autoSize.width *= 10; // 10em
|
||||
// nsFrame::ComputeSize calls GetMinimumWidgetSize to prevent us from being
|
||||
// given too small a size when we're natively themed. If we're themed, we set
|
||||
// our "thickness" dimension to zero below and rely on that
|
||||
// GetMinimumWidgetSize check to correct that dimension to the natural
|
||||
// thickness of a slider in the current theme.
|
||||
|
||||
if (isHorizontal) {
|
||||
autoSize.width = LONG_SIDE_TO_SHORT_SIDE_RATIO * oneEm;
|
||||
autoSize.height = IsThemed() ? 0 : oneEm;
|
||||
} else {
|
||||
autoSize.height *= 10; // 10em
|
||||
autoSize.width = IsThemed() ? 0 : oneEm;
|
||||
autoSize.height = LONG_SIDE_TO_SHORT_SIDE_RATIO * oneEm;
|
||||
}
|
||||
|
||||
return autoSize;
|
||||
@ -309,62 +395,51 @@ nsRangeFrame::ComputeAutoSize(nsRenderingContext *aRenderingContext,
|
||||
nscoord
|
||||
nsRangeFrame::GetMinWidth(nsRenderingContext *aRenderingContext)
|
||||
{
|
||||
nsRefPtr<nsFontMetrics> fontMet;
|
||||
NS_ENSURE_SUCCESS(
|
||||
nsLayoutUtils::GetFontMetricsForFrame(this, getter_AddRefs(fontMet)), 0);
|
||||
|
||||
nscoord minWidth = fontMet->Font().size; // 1em
|
||||
|
||||
nsSize size = GetSize();
|
||||
if (IsHorizontal(size.width, size.height)) {
|
||||
minWidth *= 10; // 10em
|
||||
}
|
||||
|
||||
return minWidth;
|
||||
// nsFrame::ComputeSize calls GetMinimumWidgetSize to prevent us from being
|
||||
// given too small a size when we're natively themed. If we aren't native
|
||||
// themed, we don't mind how small we're sized.
|
||||
return nscoord(0);
|
||||
}
|
||||
|
||||
nscoord
|
||||
nsRangeFrame::GetPrefWidth(nsRenderingContext *aRenderingContext)
|
||||
{
|
||||
return GetMinWidth(aRenderingContext);
|
||||
// frameSizeOverride values just gets us to fall back to being horizontal:
|
||||
nsSize frameSizeOverride(10,1);
|
||||
bool isHorizontal = IsHorizontal(&frameSizeOverride);
|
||||
|
||||
if (!isHorizontal && IsThemed()) {
|
||||
// nsFrame::ComputeSize calls GetMinimumWidgetSize to prevent us from being
|
||||
// given too small a size when we're natively themed. We return zero and
|
||||
// depend on that correction to get our "natuaral" width when we're a
|
||||
// vertical slider.
|
||||
return 0;
|
||||
}
|
||||
|
||||
nscoord prefWidth = NSToCoordRound(GetStyleFont()->mFont.size *
|
||||
nsLayoutUtils::FontSizeInflationFor(this)); // 1em
|
||||
|
||||
if (isHorizontal) {
|
||||
prefWidth *= LONG_SIDE_TO_SHORT_SIDE_RATIO;
|
||||
}
|
||||
|
||||
return prefWidth;
|
||||
}
|
||||
|
||||
double
|
||||
nsRangeFrame::GetMin() const
|
||||
bool
|
||||
nsRangeFrame::IsHorizontal(const nsSize *aFrameSizeOverride) const
|
||||
{
|
||||
return static_cast<nsHTMLInputElement*>(mContent)->GetMinimum();
|
||||
return true; // until we decide how to support vertical range (bug 840820)
|
||||
}
|
||||
|
||||
double
|
||||
nsRangeFrame::GetMax() const
|
||||
nsIAtom*
|
||||
nsRangeFrame::GetType() const
|
||||
{
|
||||
return static_cast<nsHTMLInputElement*>(mContent)->GetMaximum();
|
||||
}
|
||||
|
||||
double
|
||||
nsRangeFrame::GetValue() const
|
||||
{
|
||||
return static_cast<nsHTMLInputElement*>(mContent)->GetValueAsDouble();
|
||||
return nsGkAtoms::rangeFrame;
|
||||
}
|
||||
|
||||
bool
|
||||
nsRangeFrame::ShouldUseNativeStyle() const
|
||||
{
|
||||
// Use the native style if these conditions are satisfied:
|
||||
// - both frames use the native appearance;
|
||||
// - neither frame has author specified rules setting the border or the
|
||||
// background.
|
||||
return (GetStyleDisplay()->mAppearance == NS_THEME_SCALE_HORIZONTAL) &&
|
||||
(mThumbDiv->GetPrimaryFrame()->GetStyleDisplay()->mAppearance == NS_THEME_SCALE_THUMB_HORIZONTAL) &&
|
||||
!PresContext()->HasAuthorSpecifiedRules(const_cast<nsRangeFrame*>(this),
|
||||
NS_AUTHOR_SPECIFIED_BORDER | NS_AUTHOR_SPECIFIED_BACKGROUND) &&
|
||||
!PresContext()->HasAuthorSpecifiedRules(mThumbDiv->GetPrimaryFrame(),
|
||||
NS_AUTHOR_SPECIFIED_BORDER | NS_AUTHOR_SPECIFIED_BACKGROUND);
|
||||
}
|
||||
|
||||
bool nsRangeFrame::IsHorizontal(nscoord width, nscoord height) {
|
||||
if (GetStyleDisplay()->mOrient == NS_STYLE_ORIENT_VERTICAL)
|
||||
return false;
|
||||
|
||||
return width >= height;
|
||||
return false; // TODO
|
||||
}
|
||||
|
||||
@ -9,56 +9,38 @@
|
||||
#include "mozilla/Attributes.h"
|
||||
#include "nsContainerFrame.h"
|
||||
#include "nsIAnonymousContentCreator.h"
|
||||
#include "nsRepeatService.h"
|
||||
#include "nsCOMPtr.h"
|
||||
#include "nsDOMTouchEvent.h"
|
||||
#include "nsIDOMEventListener.h"
|
||||
|
||||
class nsBaseContentList;
|
||||
class nsRangeFrame;
|
||||
|
||||
class nsRangeMediator : public nsIDOMEventListener
|
||||
{
|
||||
public:
|
||||
|
||||
NS_DECL_ISUPPORTS
|
||||
|
||||
nsRangeFrame* mRange;
|
||||
|
||||
nsRangeMediator(nsRangeFrame* aRange) { mRange = aRange; }
|
||||
virtual ~nsRangeMediator() {}
|
||||
|
||||
virtual void SetRange(nsRangeFrame* aRange) { mRange = aRange; }
|
||||
};
|
||||
|
||||
class nsRangeFrame : public nsContainerFrame,
|
||||
public nsIAnonymousContentCreator
|
||||
{
|
||||
friend nsIFrame*
|
||||
NS_NewRangeFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
|
||||
|
||||
nsRangeFrame(nsStyleContext* aContext);
|
||||
virtual ~nsRangeFrame();
|
||||
|
||||
public:
|
||||
NS_DECL_QUERYFRAME_TARGET(nsRangeFrame)
|
||||
NS_DECL_QUERYFRAME
|
||||
NS_DECL_FRAMEARENA_HELPERS
|
||||
|
||||
// nsIFrame overrides
|
||||
NS_IMETHODIMP SetInitialChildList(ChildListID aListID,
|
||||
nsFrameList& aChildList) MOZ_OVERRIDE;
|
||||
|
||||
nsRangeFrame(nsStyleContext* aContext);
|
||||
virtual ~nsRangeFrame();
|
||||
|
||||
virtual void DestroyFrom(nsIFrame* aDestructRoot) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
|
||||
void BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
||||
const nsRect& aDirtyRect,
|
||||
const nsDisplayListSet& aLists) MOZ_OVERRIDE;
|
||||
|
||||
NS_IMETHOD Reflow(nsPresContext* aCX,
|
||||
NS_IMETHOD Reflow(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
nsReflowStatus& aStatus) MOZ_OVERRIDE;
|
||||
|
||||
#ifdef DEBUG
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const {
|
||||
NS_IMETHOD GetFrameName(nsAString& aResult) const MOZ_OVERRIDE {
|
||||
return MakeFrameName(NS_LITERAL_STRING("Range"), aResult);
|
||||
}
|
||||
#endif
|
||||
@ -72,25 +54,35 @@ public:
|
||||
|
||||
NS_IMETHOD AttributeChanged(int32_t aNameSpaceID,
|
||||
nsIAtom* aAttribute,
|
||||
int32_t aModType);
|
||||
int32_t aModType) MOZ_OVERRIDE;
|
||||
|
||||
virtual nsSize ComputeAutoSize(nsRenderingContext *aRenderingContext,
|
||||
nsSize aCBSize, nscoord aAvailableWidth,
|
||||
nsSize aMargin, nsSize aBorder,
|
||||
nsSize aPadding, bool aShrinkWrap) MOZ_OVERRIDE;
|
||||
|
||||
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext);
|
||||
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext);
|
||||
virtual nscoord GetMinWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
|
||||
virtual nscoord GetPrefWidth(nsRenderingContext *aRenderingContext) MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const
|
||||
virtual nsIAtom* GetType() const MOZ_OVERRIDE;
|
||||
|
||||
virtual bool IsFrameOfType(uint32_t aFlags) const MOZ_OVERRIDE
|
||||
{
|
||||
return nsContainerFrame::IsFrameOfType(aFlags &
|
||||
~(nsIFrame::eReplaced | nsIFrame::eReplacedContainsBlock));
|
||||
}
|
||||
|
||||
double GetMin() const;
|
||||
double GetMax() const;
|
||||
double GetValue() const;
|
||||
/**
|
||||
* Returns true if the slider's thumb moves horizontally, or else false if it
|
||||
* moves vertically.
|
||||
*
|
||||
* aOverrideFrameSize If specified, this will be used instead of the size of
|
||||
* the frame's rect (i.e. the frame's border-box size) if the frame's
|
||||
* rect would have otherwise been examined. This should only be specified
|
||||
* during reflow when the frame's [new] border-box size has not yet been
|
||||
* stored in its mRect.
|
||||
*/
|
||||
bool IsHorizontal(const nsSize *aFrameSizeOverride = nullptr) const;
|
||||
|
||||
/**
|
||||
* Returns whether the frame and its child should use the native style.
|
||||
@ -98,32 +90,31 @@ public:
|
||||
bool ShouldUseNativeStyle() const;
|
||||
|
||||
private:
|
||||
bool IsHorizontal(nscoord width, nscoord height);
|
||||
void SetCurrentThumbPosition(double position);
|
||||
void AddListener();
|
||||
void RemoveListener();
|
||||
|
||||
nscoord mChange;
|
||||
// Helper function which reflows the anonymous div frames.
|
||||
nsresult ReflowAnonymousContent(nsPresContext* aPresContext,
|
||||
nsHTMLReflowMetrics& aDesiredSize,
|
||||
const nsHTMLReflowState& aReflowState);
|
||||
|
||||
protected:
|
||||
// Helper function which reflow the anonymous div frame.
|
||||
void ReflowBarFrame(nsPresContext* aPresContext,
|
||||
const nsHTMLReflowState& aReflowState,
|
||||
nsReflowStatus& aStatus);
|
||||
/**
|
||||
* Returns the input element's value as a fraction of the difference between
|
||||
* the input's minimum and its maximum (i.e. returns 0.0 when the value is
|
||||
* the same as the minimum, and returns 1.0 when the value is the same as the
|
||||
* maximum).
|
||||
*/
|
||||
double GetValueAsFractionOfRange();
|
||||
|
||||
/**
|
||||
* The div used to show the track.
|
||||
* @see nsRangeFrame::CreateAnonymousContent
|
||||
*/
|
||||
nsCOMPtr<nsIContent> mTrackDiv;
|
||||
|
||||
/**
|
||||
* The div used to show the thumb.
|
||||
* @see nsRangeFrame::CreateAnonymousContent
|
||||
*/
|
||||
nsCOMPtr<nsIContent> mThumbDiv;
|
||||
|
||||
/**
|
||||
* The div used to show the active progress.
|
||||
* @see nsRangeFrame::CreateAnonymousContent
|
||||
*/
|
||||
nsCOMPtr<nsIContent> mProgressDiv;
|
||||
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
@ -669,7 +669,7 @@ progress {
|
||||
}
|
||||
|
||||
::-moz-progress-bar {
|
||||
/* Block styles that would change the type of frame we construct. */
|
||||
/* Prevent styling that would change the type of frame we construct. */
|
||||
display: inline-block ! important;
|
||||
float: none ! important;
|
||||
position: static ! important;
|
||||
@ -718,34 +718,54 @@ meter {
|
||||
}
|
||||
|
||||
input[type="range"] {
|
||||
cursor: move;
|
||||
-moz-appearance: scale-horizontal;
|
||||
display: inline-block;
|
||||
|
||||
/* Default style in case of there is -moz-appearance: none; */
|
||||
border: 2px solid;
|
||||
/* #e6e6e6 is a light gray. */
|
||||
-moz-border-top-colors: ThreeDShadow #e6e6e6;
|
||||
-moz-border-right-colors: ThreeDHighlight #e6e6e6;
|
||||
-moz-border-bottom-colors: ThreeDHighlight #e6e6e6;
|
||||
-moz-border-left-colors: ThreeDShadow #e6e6e6;
|
||||
background-color: #e6e6e6;
|
||||
-moz-appearance: none;
|
||||
display: inline-block !important;
|
||||
cursor: default;
|
||||
width: 12em;
|
||||
height: 1.3em;
|
||||
background: none;
|
||||
border: none;
|
||||
margin: 0 0.7em;
|
||||
}
|
||||
|
||||
::-moz-range-thumb {
|
||||
/* Block styles that would change the type of frame we construct. */
|
||||
display: inline-block ! important;
|
||||
float: none ! important;
|
||||
position: static ! important;
|
||||
overflow: visible ! important;
|
||||
-moz-box-sizing: border-box ! important;
|
||||
|
||||
-moz-appearance: scale-thumb-horizontal;
|
||||
height: 100%;
|
||||
/**
|
||||
* Layout handles positioning of this pseudo-element specially (so that content
|
||||
* authors can concentrate on styling the thumb without worrying about the
|
||||
* logic to position it). Specifically the 'margin', 'top' and 'left'
|
||||
* properties are ignored.
|
||||
*
|
||||
* If content authors want to have a vertical range, they will also need to
|
||||
* set the width/height of this pseudo-element.
|
||||
*/
|
||||
::-moz-range-track {
|
||||
/* Prevent styling that would change the type of frame we construct. */
|
||||
display: inline-block !important;
|
||||
float: none !important;
|
||||
position: static !important;
|
||||
border: none;
|
||||
border-top: solid 0.1em lightgrey;
|
||||
border-bottom: solid 0.1em lightgrey;
|
||||
background-color: grey;
|
||||
width: 100%;
|
||||
height: 0.2em;
|
||||
}
|
||||
|
||||
/* Default style in case of there is -moz-appearance: none; */
|
||||
background-color: #0064b4; /* blue */
|
||||
/**
|
||||
* Layout handles positioning of this pseudo-element specially (so that content
|
||||
* authors can concentrate on styling the thumb without worrying about the
|
||||
* logic to position it). Specifically the 'margin', 'top' and 'left'
|
||||
* properties are ignored.
|
||||
*/
|
||||
::-moz-range-thumb {
|
||||
/* Prevent styling that would change the type of frame we construct. */
|
||||
display: inline-block !important;
|
||||
float: none !important;
|
||||
position: static !important;
|
||||
width: 1em;
|
||||
height: 1em;
|
||||
border: 0.1em solid grey;
|
||||
border-radius: 0.5em;
|
||||
background-image: url("data:image/svg+xml;utf8,<svg xmlns='http://www.w3.org/2000/svg'><linearGradient id='g' x2='0' y2='100%'><stop stop-color='%23ddd'/><stop offset='100%' stop-color='white'/></linearGradient><rect fill='url(%23g)' width='100%' height='100%'/></svg>");
|
||||
}
|
||||
|
||||
%ifdef XP_OS2
|
||||
|
||||
@ -561,8 +561,6 @@ CSS_KEY(menulist-text, menulist_text)
|
||||
CSS_KEY(menulist-textfield, menulist_textfield)
|
||||
CSS_KEY(meterbar, meterbar)
|
||||
CSS_KEY(meterchunk, meterchunk)
|
||||
CSS_KEY(range-thumb, range_thumb)
|
||||
CSS_KEY(range-active, range_active)
|
||||
CSS_KEY(scale-horizontal, scale_horizontal)
|
||||
CSS_KEY(scale-vertical, scale_vertical)
|
||||
CSS_KEY(scalethumb-horizontal, scalethumb_horizontal)
|
||||
|
||||
@ -53,7 +53,7 @@ CSS_PSEUDO_ELEMENT(mozMathAnonymous, ":-moz-math-anonymous", 0)
|
||||
|
||||
// HTML5 Forms pseudo elements
|
||||
CSS_PSEUDO_ELEMENT(mozProgressBar, ":-moz-progress-bar", 0)
|
||||
CSS_PSEUDO_ELEMENT(mozRangeTrack, ":-moz-range-track", 0)
|
||||
CSS_PSEUDO_ELEMENT(mozRangeThumb, ":-moz-range-thumb", 0)
|
||||
CSS_PSEUDO_ELEMENT(mozRangeActive, ":-moz-range-active", 0)
|
||||
CSS_PSEUDO_ELEMENT(mozMeterBar, ":-moz-meter-bar", 0)
|
||||
CSS_PSEUDO_ELEMENT(mozPlaceholder, ":-moz-placeholder", 0)
|
||||
|
||||
Loading…
Reference in New Issue
Block a user