| Index: sky/engine/platform/scroll/Scrollbar.cpp
|
| diff --git a/sky/engine/platform/scroll/Scrollbar.cpp b/sky/engine/platform/scroll/Scrollbar.cpp
|
| deleted file mode 100644
|
| index 72ebd85d7fd3245d1adedad3d2781c0f50bf9632..0000000000000000000000000000000000000000
|
| --- a/sky/engine/platform/scroll/Scrollbar.cpp
|
| +++ /dev/null
|
| @@ -1,384 +0,0 @@
|
| -/*
|
| - * Copyright (C) 2004, 2006, 2008 Apple Inc. All rights reserved.
|
| - *
|
| - * Redistribution and use in source and binary forms, with or without
|
| - * modification, are permitted provided that the following conditions
|
| - * are met:
|
| - * 1. Redistributions of source code must retain the above copyright
|
| - * notice, this list of conditions and the following disclaimer.
|
| - * 2. Redistributions in binary form must reproduce the above copyright
|
| - * notice, this list of conditions and the following disclaimer in the
|
| - * documentation and/or other materials provided with the distribution.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
|
| - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
| - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
| - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
|
| - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
| - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
|
| - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
|
| - * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
| - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
| - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| - */
|
| -
|
| -#include "sky/engine/config.h"
|
| -#include "sky/engine/platform/scroll/Scrollbar.h"
|
| -
|
| -#include "sky/engine/platform/graphics/GraphicsContext.h"
|
| -#include "sky/engine/platform/scroll/ScrollAnimator.h"
|
| -#include "sky/engine/platform/scroll/ScrollableArea.h"
|
| -#include "sky/engine/platform/scroll/Scrollbar.h"
|
| -#include "sky/engine/public/platform/Platform.h"
|
| -#include "sky/engine/public/platform/WebPoint.h"
|
| -#include "sky/engine/public/platform/WebRect.h"
|
| -
|
| -// The position of the scrollbar thumb affects the appearance of the steppers, so
|
| -// when the thumb moves, we have to invalidate them for painting.
|
| -#define THUMB_POSITION_AFFECTS_BUTTONS
|
| -
|
| -namespace blink {
|
| -
|
| -static const int kThumbThickness = 3;
|
| -static const int kScrollbarMargin = 3;
|
| -
|
| -PassRefPtr<Scrollbar> Scrollbar::create(ScrollableArea* scrollableArea, ScrollbarOrientation orientation)
|
| -{
|
| - return adoptRef(new Scrollbar(scrollableArea, orientation));
|
| -}
|
| -
|
| -Scrollbar::Scrollbar(ScrollableArea* scrollableArea, ScrollbarOrientation orientation)
|
| - : m_scrollableArea(scrollableArea)
|
| - , m_orientation(orientation)
|
| - , m_visibleSize(0)
|
| - , m_totalSize(0)
|
| - , m_currentPos(0)
|
| - , m_dragOrigin(0)
|
| - , m_hoveredPart(NoPart)
|
| - , m_pressedPart(NoPart)
|
| - , m_pressedPos(0)
|
| - , m_scrollPos(0)
|
| - , m_documentDragPos(0)
|
| - , m_scrollTimer(this, &Scrollbar::autoscrollTimerFired)
|
| - , m_overlapsResizer(false)
|
| -{
|
| - // FIXME: This is ugly and would not be necessary if we fix cross-platform code to actually query for
|
| - // scrollbar thickness and use it when sizing scrollbars (rather than leaving one dimension of the scrollbar
|
| - // alone when sizing).
|
| - int thickness = scrollbarThickness();
|
| - Widget::setFrameRect(IntRect(0, 0, thickness, thickness));
|
| -
|
| - m_currentPos = scrollableAreaCurrentPos();
|
| -}
|
| -
|
| -Scrollbar::~Scrollbar()
|
| -{
|
| - stopTimerIfNeeded();
|
| -}
|
| -
|
| -bool Scrollbar::isScrollableAreaActive() const
|
| -{
|
| - return m_scrollableArea && m_scrollableArea->isActive();
|
| -}
|
| -
|
| -bool Scrollbar::isLeftSideVerticalScrollbar() const
|
| -{
|
| - if (m_orientation == VerticalScrollbar && m_scrollableArea)
|
| - return m_scrollableArea->shouldPlaceVerticalScrollbarOnLeft();
|
| - return false;
|
| -}
|
| -
|
| -void Scrollbar::offsetDidChange()
|
| -{
|
| - ASSERT(m_scrollableArea);
|
| -
|
| - float position = scrollableAreaCurrentPos();
|
| - if (position == m_currentPos)
|
| - return;
|
| -
|
| - int oldThumbPosition = thumbPosition();
|
| - m_currentPos = position;
|
| - if (m_pressedPart == ThumbPart)
|
| - setPressedPos(m_pressedPos + thumbPosition() - oldThumbPosition);
|
| -}
|
| -
|
| -void Scrollbar::setProportion(int visibleSize, int totalSize)
|
| -{
|
| - if (visibleSize == m_visibleSize && totalSize == m_totalSize)
|
| - return;
|
| -
|
| - m_visibleSize = visibleSize;
|
| - m_totalSize = totalSize;
|
| -}
|
| -
|
| -void Scrollbar::paint(GraphicsContext* context, const IntRect& damageRect)
|
| -{
|
| - if (!frameRect().intersects(damageRect))
|
| - return;
|
| -
|
| - IntRect startTrackRect;
|
| - IntRect thumbRect;
|
| - IntRect endTrackRect;
|
| - splitTrack(trackRect(), startTrackRect, thumbRect, endTrackRect);
|
| - if (damageRect.intersects(thumbRect))
|
| - paintThumb(context, thumbRect);
|
| -}
|
| -
|
| -void Scrollbar::autoscrollTimerFired(Timer<Scrollbar>*)
|
| -{
|
| - autoscrollPressedPart(autoscrollTimerDelay());
|
| -}
|
| -
|
| -void Scrollbar::autoscrollPressedPart(double delay)
|
| -{
|
| - // Don't do anything for the thumb or if nothing was pressed.
|
| - if (m_pressedPart == ThumbPart || m_pressedPart == NoPart)
|
| - return;
|
| -
|
| - // Handle the arrows and track.
|
| - if (m_scrollableArea && m_scrollableArea->scroll(pressedPartScrollDirection(), pressedPartScrollGranularity()))
|
| - startTimerIfNeeded(delay);
|
| -}
|
| -
|
| -void Scrollbar::startTimerIfNeeded(double delay)
|
| -{
|
| - // Don't do anything for the thumb.
|
| - if (m_pressedPart == ThumbPart)
|
| - return;
|
| -
|
| - // We can't scroll if we've hit the beginning or end.
|
| - ScrollDirection dir = pressedPartScrollDirection();
|
| - if (dir == ScrollUp || dir == ScrollLeft) {
|
| - if (m_currentPos == 0)
|
| - return;
|
| - } else {
|
| - if (m_currentPos == maximum())
|
| - return;
|
| - }
|
| -
|
| - m_scrollTimer.startOneShot(delay, FROM_HERE);
|
| -}
|
| -
|
| -void Scrollbar::stopTimerIfNeeded()
|
| -{
|
| - if (m_scrollTimer.isActive())
|
| - m_scrollTimer.stop();
|
| -}
|
| -
|
| -ScrollDirection Scrollbar::pressedPartScrollDirection()
|
| -{
|
| - if (m_orientation == HorizontalScrollbar) {
|
| - if (m_pressedPart == BackTrackPart)
|
| - return ScrollLeft;
|
| - return ScrollRight;
|
| - } else {
|
| - if (m_pressedPart == BackTrackPart)
|
| - return ScrollUp;
|
| - return ScrollDown;
|
| - }
|
| -}
|
| -
|
| -ScrollGranularity Scrollbar::pressedPartScrollGranularity()
|
| -{
|
| - // FIXME(sky): Remove
|
| - return ScrollByPage;
|
| -}
|
| -
|
| -void Scrollbar::moveThumb(int pos)
|
| -{
|
| - if (!m_scrollableArea)
|
| - return;
|
| -
|
| - int delta = pos - m_pressedPos;
|
| -
|
| - // Drag the thumb.
|
| - int thumbPos = thumbPosition();
|
| - int thumbLen = thumbLength();
|
| - int trackLen = trackLength();
|
| - if (delta > 0)
|
| - delta = std::min(trackLen - thumbLen - thumbPos, delta);
|
| - else if (delta < 0)
|
| - delta = std::max(-thumbPos, delta);
|
| -
|
| - float minPos = m_scrollableArea->minimumScrollPosition(m_orientation);
|
| - float maxPos = m_scrollableArea->maximumScrollPosition(m_orientation);
|
| - if (delta) {
|
| - float newPosition = static_cast<float>(thumbPos + delta) * (maxPos - minPos) / (trackLen - thumbLen) + minPos;
|
| - m_scrollableArea->scrollToOffsetWithoutAnimation(m_orientation, newPosition);
|
| - }
|
| -}
|
| -
|
| -void Scrollbar::setHoveredPart(ScrollbarPart part)
|
| -{
|
| - if (part == m_hoveredPart)
|
| - return;
|
| - m_hoveredPart = part;
|
| -}
|
| -
|
| -void Scrollbar::setPressedPart(ScrollbarPart part)
|
| -{
|
| - m_pressedPart = part;
|
| -}
|
| -
|
| -bool Scrollbar::isOverlayScrollbar() const
|
| -{
|
| - // FIXME(sky): Remove
|
| - return true;
|
| -}
|
| -
|
| -bool Scrollbar::shouldParticipateInHitTesting()
|
| -{
|
| - // Non-overlay scrollbars should always participate in hit testing.
|
| - if (!isOverlayScrollbar())
|
| - return true;
|
| - return m_scrollableArea->scrollAnimator()->shouldScrollbarParticipateInHitTesting(this);
|
| -}
|
| -
|
| -IntRect Scrollbar::convertToContainingView(const IntRect& localRect) const
|
| -{
|
| - if (m_scrollableArea)
|
| - return m_scrollableArea->convertFromScrollbarToContainingView(this, localRect);
|
| -
|
| - return Widget::convertToContainingView(localRect);
|
| -}
|
| -
|
| -IntRect Scrollbar::convertFromContainingView(const IntRect& parentRect) const
|
| -{
|
| - if (m_scrollableArea)
|
| - return m_scrollableArea->convertFromContainingViewToScrollbar(this, parentRect);
|
| -
|
| - return Widget::convertFromContainingView(parentRect);
|
| -}
|
| -
|
| -IntPoint Scrollbar::convertToContainingView(const IntPoint& localPoint) const
|
| -{
|
| - if (m_scrollableArea)
|
| - return m_scrollableArea->convertFromScrollbarToContainingView(this, localPoint);
|
| -
|
| - return Widget::convertToContainingView(localPoint);
|
| -}
|
| -
|
| -IntPoint Scrollbar::convertFromContainingView(const IntPoint& parentPoint) const
|
| -{
|
| - if (m_scrollableArea)
|
| - return m_scrollableArea->convertFromContainingViewToScrollbar(this, parentPoint);
|
| -
|
| - return Widget::convertFromContainingView(parentPoint);
|
| -}
|
| -
|
| -float Scrollbar::scrollableAreaCurrentPos() const
|
| -{
|
| - if (!m_scrollableArea)
|
| - return 0;
|
| -
|
| - if (m_orientation == HorizontalScrollbar)
|
| - return m_scrollableArea->scrollPosition().x() - m_scrollableArea->minimumScrollPosition().x();
|
| -
|
| - return m_scrollableArea->scrollPosition().y() - m_scrollableArea->minimumScrollPosition().y();
|
| -}
|
| -
|
| -int Scrollbar::scrollbarThickness()
|
| -{
|
| - return kThumbThickness + kScrollbarMargin;
|
| -}
|
| -
|
| -int Scrollbar::thumbPosition()
|
| -{
|
| - if (!totalSize())
|
| - return 0;
|
| -
|
| - int trackLen = trackLength();
|
| - float proportion = static_cast<float>(currentPos()) / totalSize();
|
| - return round(proportion * trackLen);
|
| -}
|
| -
|
| -int Scrollbar::thumbLength()
|
| -{
|
| - int trackLen = trackLength();
|
| -
|
| - if (!totalSize())
|
| - return trackLen;
|
| -
|
| - float proportion = static_cast<float>(visibleSize()) / totalSize();
|
| - int length = round(proportion * trackLen);
|
| - length = std::min(std::max(length, minimumThumbLength()), trackLen);
|
| - return length;
|
| -}
|
| -
|
| -int Scrollbar::trackPosition()
|
| -{
|
| - IntRect rect = trackRect();
|
| - return (orientation() == HorizontalScrollbar) ? rect.x() - x() : rect.y() - y();
|
| -}
|
| -
|
| -int Scrollbar::trackLength()
|
| -{
|
| - IntRect rect = trackRect();
|
| - return (orientation() == HorizontalScrollbar) ? rect.width() : rect.height();
|
| -}
|
| -
|
| -IntRect Scrollbar::trackRect()
|
| -{
|
| - IntRect rect = frameRect();
|
| - if (orientation() == HorizontalScrollbar)
|
| - rect.inflateX(-kScrollbarMargin);
|
| - else
|
| - rect.inflateY(-kScrollbarMargin);
|
| - return rect;
|
| -}
|
| -
|
| -IntRect Scrollbar::thumbRect()
|
| -{
|
| - IntRect track = trackRect();
|
| - IntRect startTrackRect;
|
| - IntRect thumbRect;
|
| - IntRect endTrackRect;
|
| - splitTrack(track, startTrackRect, thumbRect, endTrackRect);
|
| -
|
| - return thumbRect;
|
| -}
|
| -
|
| -int Scrollbar::thumbThickness()
|
| -{
|
| - return kThumbThickness;
|
| -}
|
| -
|
| -int Scrollbar::minimumThumbLength()
|
| -{
|
| - return scrollbarThickness();
|
| -}
|
| -
|
| -void Scrollbar::splitTrack(const IntRect& trackRect, IntRect& beforeThumbRect, IntRect& thumbRect, IntRect& afterThumbRect)
|
| -{
|
| - // This function won't even get called unless we're big enough to have some combination of these three rects where at least
|
| - // one of them is non-empty.
|
| - int thumbPos = thumbPosition();
|
| - if (orientation() == HorizontalScrollbar) {
|
| - thumbRect = IntRect(trackRect.x() + thumbPos, trackRect.y(), thumbLength(), height());
|
| - beforeThumbRect = IntRect(trackRect.x(), trackRect.y(), thumbPos + thumbRect.width() / 2, trackRect.height());
|
| - afterThumbRect = IntRect(trackRect.x() + beforeThumbRect.width(), trackRect.y(), trackRect.maxX() - beforeThumbRect.maxX(), trackRect.height());
|
| - } else {
|
| - thumbRect = IntRect(trackRect.x(), trackRect.y() + thumbPos, width(), thumbLength());
|
| - beforeThumbRect = IntRect(trackRect.x(), trackRect.y(), trackRect.width(), thumbPos + thumbRect.height() / 2);
|
| - afterThumbRect = IntRect(trackRect.x(), trackRect.y() + beforeThumbRect.height(), trackRect.width(), trackRect.maxY() - beforeThumbRect.maxY());
|
| - }
|
| -}
|
| -
|
| -void Scrollbar::paintThumb(GraphicsContext* context, const IntRect& rect)
|
| -{
|
| - // FIXME(sky): This function appears to be dead code.
|
| - IntRect thumbRect = rect;
|
| - if (orientation() == HorizontalScrollbar) {
|
| - thumbRect.setHeight(thumbRect.height() - kScrollbarMargin);
|
| - } else {
|
| - thumbRect.setWidth(thumbRect.width() - kScrollbarMargin);
|
| - if (isLeftSideVerticalScrollbar())
|
| - thumbRect.setX(thumbRect.x() + kScrollbarMargin);
|
| - }
|
| -
|
| - DEFINE_STATIC_LOCAL(Color, color, (128, 128, 128, 128));
|
| - context->fillRect(thumbRect, color);
|
| -}
|
| -
|
| -} // namespace blink
|
|
|