a13711ff7b
This was caught by Markus. When you hover over an overlay scrollbar on macOS, you'd hit this the PaintScrollbar() code-path (or rather, you won't bail out from the if (overlay && !hovered)), but macOS draws the track in PaintScrollbarTrack(). Android doesn't hit this because android scrollbars can't ever be hovered (they have pointer-events: none). This is a better fix than D222172, which didn't paint the background for the non-overlay scrollbars... This doesn't change behavior since scrollbar and the track have the same size (as cocoa scrollbars can never have buttons). Removing nsSliderFrame is a refactor for another day if ever. Differential Revision: https://phabricator.services.mozilla.com/D222194
77 lines
3.6 KiB
C++
77 lines
3.6 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/. */
|
|
|
|
#ifndef mozilla_widget_ScrollbarDrawingCocoa_h
|
|
#define mozilla_widget_ScrollbarDrawingCocoa_h
|
|
|
|
#include "ScrollbarDrawing.h"
|
|
|
|
#include "mozilla/Array.h"
|
|
|
|
namespace mozilla::widget {
|
|
|
|
class ScrollbarDrawingCocoa final : public ScrollbarDrawing {
|
|
public:
|
|
ScrollbarDrawingCocoa() : ScrollbarDrawing(Kind::Cocoa) {}
|
|
virtual ~ScrollbarDrawingCocoa() = default;
|
|
|
|
LayoutDeviceIntSize GetMinimumWidgetSize(nsPresContext*,
|
|
StyleAppearance aAppearance,
|
|
nsIFrame* aFrame) override;
|
|
|
|
static CSSIntCoord GetScrollbarSize(StyleScrollbarWidth, bool aOverlay);
|
|
|
|
template <typename PaintBackendData>
|
|
void DoPaintScrollbarThumb(PaintBackendData&, const LayoutDeviceRect& aRect,
|
|
ScrollbarKind, nsIFrame* aFrame,
|
|
const ComputedStyle& aStyle, const ElementState&,
|
|
const DocumentState&, const Colors&,
|
|
const DPIRatio&);
|
|
bool PaintScrollbarThumb(DrawTarget&, const LayoutDeviceRect&, ScrollbarKind,
|
|
nsIFrame*, const ComputedStyle&, const ElementState&,
|
|
const DocumentState&, const Colors&,
|
|
const DPIRatio&) override;
|
|
bool PaintScrollbarThumb(WebRenderBackendData&, const LayoutDeviceRect&,
|
|
ScrollbarKind, nsIFrame*, const ComputedStyle&,
|
|
const ElementState&, const DocumentState&,
|
|
const Colors&, const DPIRatio&) override;
|
|
|
|
template <typename PaintBackendData>
|
|
void DoPaintScrollbar(PaintBackendData&, const LayoutDeviceRect&,
|
|
ScrollbarKind, nsIFrame*, const ComputedStyle&,
|
|
const ElementState&, const DocumentState&,
|
|
const Colors&, const DPIRatio&);
|
|
bool PaintScrollbar(DrawTarget&, const LayoutDeviceRect&, ScrollbarKind,
|
|
nsIFrame*, const ComputedStyle&, const ElementState&,
|
|
const DocumentState&, const Colors&,
|
|
const DPIRatio&) override;
|
|
bool PaintScrollbar(WebRenderBackendData&, const LayoutDeviceRect&,
|
|
ScrollbarKind, nsIFrame*, const ComputedStyle&,
|
|
const ElementState&, const DocumentState&, const Colors&,
|
|
const DPIRatio&) override;
|
|
|
|
template <typename PaintBackendData>
|
|
void DoPaintScrollCorner(PaintBackendData&, const LayoutDeviceRect&,
|
|
ScrollbarKind, nsIFrame*, const ComputedStyle&,
|
|
const DocumentState&, const Colors&,
|
|
const DPIRatio&);
|
|
bool PaintScrollCorner(DrawTarget&, const LayoutDeviceRect&, ScrollbarKind,
|
|
nsIFrame*, const ComputedStyle&, const DocumentState&,
|
|
const Colors&, const DPIRatio&) override;
|
|
bool PaintScrollCorner(WebRenderBackendData&, const LayoutDeviceRect&,
|
|
ScrollbarKind, nsIFrame*, const ComputedStyle&,
|
|
const DocumentState&, const Colors&,
|
|
const DPIRatio&) override;
|
|
|
|
void RecomputeScrollbarParams() override;
|
|
|
|
bool ShouldDrawScrollbarButtons() override { return false; }
|
|
};
|
|
|
|
} // namespace mozilla::widget
|
|
|
|
#endif
|