mirror of
https://github.com/HeyPuter/firefox.git
synced 2026-11-13 20:14:57 -10:00
Emilio Cobos Álvarez
fd1f57b58d
This removes the implementation of nsHTMLButtonControlFrame, instead reusing nsBlockFrame + align-content (or the relevant display type for flex / grid / columns / etc). This matches what Blink does and, for the most part, it is trivial. It requires moving some special cases around, and override inline flow display, tho so that buttons don't suddenly start fragmenting in the inline axis. It adds a tiny fix for a writing-mode mismatch in nsBlockFrame::AlignContent(), covered by layout/reftests/writing-mode/1138356-1-button-contents-alignment.html containing-block-change-button tests are tweaked to avoid overflowing the 600px viewport from WPT reftests causing scrollbar fuzziness. contain-layout-baseline-005.html removes the <select> element just like https://chromium-review.googlesource.com/c/chromium/src/+/5479489 removed the <button>s, since they align the same now, added a test for that. Differential Revision: https://phabricator.services.mozilla.com/D257149
47 lines
1.8 KiB
C++
47 lines
1.8 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "ButtonControlFrame.h"
|
|
|
|
/* Abstract base class for special button frames (but not <button>) */
|
|
|
|
using namespace mozilla;
|
|
|
|
namespace mozilla {
|
|
|
|
NS_QUERYFRAME_HEAD(ButtonControlFrame)
|
|
NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator)
|
|
NS_QUERYFRAME_ENTRY(ButtonControlFrame)
|
|
NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame)
|
|
|
|
void ButtonControlFrame::EnsureNonEmptyLabel(nsAString& aLabel) {
|
|
if (aLabel.IsEmpty()) {
|
|
// Have to use a space character of some sort for line-block-size
|
|
// calculations to be right. Also, the space character must be zero-width in
|
|
// order for the inline-size calculations to be consistent between
|
|
// size-contained comboboxes vs. empty comboboxes.
|
|
//
|
|
// XXXdholbert Does this space need to be "non-breaking"? I'm not sure if it
|
|
// matters, but we previously had a comment here (added in 2002) saying
|
|
// "Have to use a non-breaking space for line-height calculations to be
|
|
// right". So I'll stick with a non-breaking space for now...
|
|
aLabel = u"\ufeff"_ns;
|
|
}
|
|
}
|
|
|
|
nsresult ButtonControlFrame::HandleEvent(nsPresContext* aPresContext,
|
|
WidgetGUIEvent* aEvent,
|
|
nsEventStatus* aEventStatus) {
|
|
// Override HandleEvent to prevent the inherited version from being called
|
|
// when disabled.
|
|
if (IsContentDisabled()) {
|
|
return nsBlockFrame::HandleEvent(aPresContext, aEvent, aEventStatus);
|
|
}
|
|
return NS_OK;
|
|
}
|
|
|
|
} // namespace mozilla
|