Reviewed by Maciej.
- Fixes parts of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10463
+ Fixes parts of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10467
+ WebKit should have Qt platform support
+
+ * platform/qt/CursorQt.cpp: Added.
+ (WebCore::Cursor::Cursor):
+ (WebCore::Cursor::~Cursor):
+ (WebCore::Cursor::operator=):
+ (WebCore::Cursors::Cursors::self):
+ (WebCore::moveCursor):
+ (WebCore::crossCursor):
+ (WebCore::handCursor):
+ (WebCore::iBeamCursor):
+ (WebCore::waitCursor):
+ (WebCore::helpCursor):
+ (WebCore::eastResizeCursor):
+ (WebCore::northResizeCursor):
+ (WebCore::northEastResizeCursor):
+ (WebCore::northWestResizeCursor):
+ (WebCore::southResizeCursor):
+ (WebCore::southEastResizeCursor):
+ (WebCore::southWestResizeCursor):
+ (WebCore::westResizeCursor):
+ (WebCore::northSouthResizeCursor):
+ (WebCore::eastWestResizeCursor):
+ (WebCore::northEastSouthWestResizeCursor):
+ (WebCore::northWestSouthEastResizeCursor):
+ (WebCore::columnResizeCursor):
+ (WebCore::rowResizeCursor):
+ * platform/qt/RenderThemeQt.cpp: Added.
+ (WebCore::RenderThemeQt::RenderThemeQt):
+ (WebCore::RenderThemeQt::supportsHover):
+ (WebCore::RenderThemeQt::paintCheckbox):
+ (WebCore::RenderThemeQt::paintRadio):
+ (WebCore::theme):
+ (WebCore::RenderThemeQt::isControlStyled):
+ (WebCore::RenderThemeQt::controlSupportsTints):
+ (WebCore::RenderThemeQt::systemFont):
+ (WebCore::RenderThemeQt::createPopupMenu):
+ (WebCore::RenderThemeQt::addIntrinsicMargins):
+ (WebCore::RenderThemeQt::stylePainterAndWidgetForPaintInfo):
+ (WebCore::RenderThemeQt::setCheckboxSize):
+ (WebCore::RenderThemeQt::setRadioSize):
+ (WebCore::RenderThemeQt::supportsFocus):
+ (WebCore::RenderThemeQt::applyTheme):
+ (WebCore::RenderThemeQt::adjustButtonStyle):
+ (WebCore::RenderThemeQt::paintButton):
+ (WebCore::RenderThemeQt::adjustTextFieldStyle):
+ (WebCore::RenderThemeQt::paintTextField):
+
+2006-08-21 Nikolas Zimmermann <zimmermann@kde.org>
+
+ Reviewed by Maciej.
+
+ Fixes parts of: http://bugzilla.opendarwin.org/show_bug.cgi?id=10467
WebKit should have Qt platform support
* platform/qt/SharedTimerQt.cpp: Added.
--- /dev/null
+/*
+ * Copyright (C) 2006 Dirk Mueller <mueller@kde.org>
+ * Copyright (C) 2006 George Staikos <staikos@kde.org>
+ * Copyright (C) 2006 Charles Samuels <charles@kde.org>
+ *
+ * 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 "config.h"
+#include "Cursor.h"
+
+#include "DeprecatedString.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+
+#define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d\n", __FILE__, __LINE__); } while(0)
+
+namespace WebCore {
+
+Cursor::Cursor(PlatformCursor p)
+ : m_impl(p)
+{
+}
+
+Cursor::Cursor(const Cursor& other)
+ : m_impl(other.m_impl)
+{
+}
+
+Cursor::~Cursor()
+{
+}
+
+Cursor::Cursor(Image*)
+{
+ notImplemented();
+}
+
+Cursor& Cursor::operator=(const Cursor& other)
+{
+ m_impl = other.m_impl;
+ return *this;
+}
+
+namespace {
+
+// FIXME: static deleter
+class Cursors {
+protected:
+ Cursors()
+ : CrossCursor(QCursor(Qt::CrossCursor))
+ , MoveCursor(QCursor(Qt::SizeAllCursor))
+ , PointingHandCursor(QCursor(Qt::PointingHandCursor))
+ , IBeamCursor(QCursor(Qt::IBeamCursor))
+ , WaitCursor(QCursor(Qt::WaitCursor))
+ , WhatsThisCursor(QCursor(Qt::WhatsThisCursor))
+ , SizeHorCursor(QCursor(Qt::SizeHorCursor))
+ , SizeVerCursor(QCursor(Qt::SizeVerCursor))
+ , SizeFDiagCursor(QCursor(Qt::SizeFDiagCursor))
+ , SizeBDiagCursor(QCursor(Qt::SizeBDiagCursor))
+ , SplitHCursor(QCursor(Qt::SplitHCursor))
+ , SplitVCursor(QCursor(Qt::SplitVCursor))
+ {
+ }
+
+ ~Cursors()
+ {
+ }
+
+public:
+ static Cursors *self();
+ static Cursors *s_self;
+
+ Cursor CrossCursor;
+ Cursor MoveCursor;
+ Cursor PointingHandCursor;
+ Cursor IBeamCursor;
+ Cursor WaitCursor;
+ Cursor WhatsThisCursor;
+ Cursor SizeHorCursor;
+ Cursor SizeVerCursor;
+ Cursor SizeFDiagCursor;
+ Cursor SizeBDiagCursor;
+ Cursor SplitHCursor;
+ Cursor SplitVCursor;
+};
+
+Cursors* Cursors::s_self = 0;
+
+Cursors* Cursors::self()
+{
+ if (!s_self) {
+ s_self = new Cursors;
+ }
+
+ return s_self;
+}
+
+}
+
+const Cursor& moveCursor()
+{
+ return Cursors::self()->MoveCursor;
+}
+
+const Cursor& crossCursor()
+{
+ return Cursors::self()->CrossCursor;
+}
+
+const Cursor& handCursor()
+{
+ return Cursors::self()->PointingHandCursor;
+}
+
+const Cursor& iBeamCursor()
+{
+ return Cursors::self()->IBeamCursor;
+}
+
+const Cursor& waitCursor()
+{
+ return Cursors::self()->WaitCursor;
+}
+
+const Cursor& helpCursor()
+{
+ return Cursors::self()->WhatsThisCursor;
+}
+
+const Cursor& eastResizeCursor()
+{
+ return Cursors::self()->SizeHorCursor;
+}
+
+const Cursor& northResizeCursor()
+{
+ return Cursors::self()->SizeVerCursor;
+}
+
+const Cursor& northEastResizeCursor()
+{
+ return Cursors::self()->SizeBDiagCursor;
+}
+
+const Cursor& northWestResizeCursor()
+{
+ return Cursors::self()->SizeFDiagCursor;
+}
+
+const Cursor& southResizeCursor()
+{
+ return Cursors::self()->SizeVerCursor;
+}
+
+const Cursor& southEastResizeCursor()
+{
+ return Cursors::self()->SizeFDiagCursor;
+}
+
+const Cursor& southWestResizeCursor()
+{
+ return Cursors::self()->SizeBDiagCursor;
+}
+
+const Cursor& westResizeCursor()
+{
+ return Cursors::self()->SizeHorCursor;
+}
+
+const Cursor& northSouthResizeCursor()
+{
+ return Cursors::self()->SizeVerCursor;
+}
+
+const Cursor& eastWestResizeCursor()
+{
+ return Cursors::self()->SizeHorCursor;
+}
+
+const Cursor& northEastSouthWestResizeCursor()
+{
+ return Cursors::self()->SizeBDiagCursor;
+}
+
+const Cursor& northWestSouthEastResizeCursor()
+{
+ return Cursors::self()->SizeFDiagCursor;
+}
+
+const Cursor& columnResizeCursor()
+{
+ return Cursors::self()->SplitHCursor;
+}
+
+const Cursor& rowResizeCursor()
+{
+ return Cursors::self()->SplitVCursor;
+}
+
+}
+
+// vim: ts=4 sw=4 et
--- /dev/null
+/*
+ * This file is part of the WebKit project.
+ *
+ * Copyright (C) 2006 Dirk Mueller <mueller@kde.org>
+ * 2006 Nikolas Zimmermann <zimmermann@kde.org>
+ *
+ * All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ */
+
+#include <QStyle>
+#include <QWidget>
+#include <QPainter>
+#include <QStyleOptionButton>
+
+#include "config.h"
+
+#include "RenderTheme.h"
+#include "GraphicsContext.h"
+
+#define notImplemented() do { fprintf(stderr, "FIXME: UNIMPLEMENTED: %s:%d\n", __FILE__, __LINE__); } while(0)
+
+namespace WebCore {
+
+class RenderThemeQt : public RenderTheme
+{
+public:
+ RenderThemeQt() : RenderTheme() { }
+
+ // A method asking if the theme's controls actually care about redrawing when hovered.
+ virtual bool supportsHover(const RenderStyle*) const { return true; }
+
+ virtual bool paintCheckbox(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
+ {
+ return paintButton(o, i, r);
+ }
+
+ virtual void setCheckboxSize(RenderStyle*) const;
+
+ virtual bool paintRadio(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
+ {
+ return paintButton(o, i, r);
+ }
+
+ virtual void setRadioSize(RenderStyle*) const;
+
+ virtual void adjustButtonStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
+ virtual bool paintButton(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+
+ virtual void adjustTextFieldStyle(CSSStyleSelector*, RenderStyle*, Element*) const;
+ virtual bool paintTextField(RenderObject*, const RenderObject::PaintInfo&, const IntRect&);
+
+ virtual bool isControlStyled(const RenderStyle*, const BorderData&,
+ const BackgroundLayer&, const Color&) const;
+
+ virtual bool controlSupportsTints(const RenderObject*) const;
+
+ virtual void systemFont(int propId, FontDescription&) const;
+ virtual RenderPopupMenu* createPopupMenu(RenderArena*, Document*, RenderMenuList*);
+
+private:
+ void addIntrinsicMargins(RenderStyle*) const;
+ void close();
+
+ bool supportsFocus(EAppearance) const;
+
+ bool stylePainterAndWidgetForPaintInfo(const RenderObject::PaintInfo&, QStyle*&, QPainter*&, QWidget*&) const;
+ EAppearance applyTheme(QStyleOption&, RenderObject*) const;
+};
+
+RenderTheme* theme()
+{
+ static RenderThemeQt rt;
+ return &rt;
+}
+
+bool RenderThemeQt::isControlStyled(const RenderStyle* style, const BorderData& border,
+ const BackgroundLayer& background, const Color& backgroundColor) const
+{
+ if (style->appearance() == TextFieldAppearance || style->appearance() == TextAreaAppearance)
+ return style->border() != border;
+
+ return RenderTheme::isControlStyled(style, border, background, backgroundColor);
+}
+
+bool RenderThemeQt::controlSupportsTints(const RenderObject* o) const
+{
+ if (!isEnabled(o))
+ return false;
+
+ // Checkboxes only have tint when checked.
+ if (o->style()->appearance() == CheckboxAppearance)
+ return isChecked(o);
+
+ // For now assume other controls have tint if enabled.
+ return true;
+}
+
+void RenderThemeQt::systemFont(int propId, FontDescription& fontDescription) const
+{
+ notImplemented();
+}
+
+RenderPopupMenu* RenderThemeQt::createPopupMenu(RenderArena*, Document*, RenderMenuList*)
+{
+ notImplemented();
+ return 0;
+}
+
+void RenderThemeQt::addIntrinsicMargins(RenderStyle* style) const
+{
+ // Cut out the intrinsic margins completely if we end up using a small font size
+ if (style->fontSize() < 11)
+ return;
+
+ // Intrinsic margin value.
+ const int m = 2;
+
+ // FIXME: Using width/height alone and not also dealing with min-width/max-width is flawed.
+ if (style->width().isIntrinsicOrAuto()) {
+ if (style->marginLeft().quirk())
+ style->setMarginLeft(Length(m, Fixed));
+
+ if (style->marginRight().quirk())
+ style->setMarginRight(Length(m, Fixed));
+ }
+
+ if (style->height().isAuto()) {
+ if (style->marginTop().quirk())
+ style->setMarginTop(Length(m, Fixed));
+
+ if (style->marginBottom().quirk())
+ style->setMarginBottom(Length(m, Fixed));
+ }
+}
+
+bool RenderThemeQt::stylePainterAndWidgetForPaintInfo(const RenderObject::PaintInfo& i, QStyle*& style, QPainter*& painter, QWidget*& widget) const
+{
+ painter = (i.p ? static_cast<QPainter*>(i.p->platformContext()) : 0);
+ widget = (painter ? static_cast<QWidget*>(painter->device()) : 0);
+ style = (widget ? widget->style() : 0);
+
+ return (painter && widget && style);
+}
+
+void RenderThemeQt::setCheckboxSize(RenderStyle* style) const
+{
+ // If the width and height are both specified, then we have nothing to do.
+ if (!style->width().isIntrinsicOrAuto() && !style->height().isAuto())
+ return;
+
+ // FIXME: A hard-coded size of 13 is used. This is wrong but necessary for now. It matches Firefox.
+ // At different DPI settings on Windows, querying the theme gives you a larger size that accounts for
+ // the higher DPI. Until our entire engine honors a DPI setting other than 96, we can't rely on the theme's
+ // metrics.
+ if (style->width().isIntrinsicOrAuto())
+ style->setWidth(Length(13, Fixed));
+
+ if (style->height().isAuto())
+ style->setHeight(Length(13, Fixed));
+}
+
+void RenderThemeQt::setRadioSize(RenderStyle* style) const
+{
+ // This is the same as checkboxes.
+ setCheckboxSize(style);
+}
+
+bool RenderThemeQt::supportsFocus(EAppearance appearance) const
+{
+ switch (appearance) {
+ case PushButtonAppearance:
+ case ButtonAppearance:
+ case TextFieldAppearance:
+ return true;
+ default: // No for all others...
+ return false;
+ }
+}
+
+EAppearance RenderThemeQt::applyTheme(QStyleOption& option, RenderObject* o) const
+{
+ // Default bits: no focus, no mouse over
+ option.state &= ~(QStyle::State_HasFocus | QStyle::State_MouseOver);
+
+ if (!isEnabled(o))
+ option.state &= ~QStyle::State_Enabled;
+
+ if (isReadOnlyControl(o))
+ option.state |= QStyle::State_ReadOnly; // Readonly is supported on textfields.
+
+ if (supportsFocus(o->style()->appearance()) && isFocused(o))
+ option.state |= QStyle::State_HasFocus;
+
+ if (isHovered(o))
+ option.state |= QStyle::State_MouseOver;
+
+ if (isPressed(o))
+ option.state |= QStyle::State_Sunken;
+
+ EAppearance result = o->style()->appearance();
+ if(result == RadioAppearance || result == CheckboxAppearance)
+ option.state |= (isChecked(o) ? QStyle::State_On : QStyle::State_Off);
+
+ return result;
+}
+
+void RenderThemeQt::adjustButtonStyle(CSSStyleSelector* selector, RenderStyle* style, Element* e) const
+{
+ addIntrinsicMargins(style);
+}
+
+bool RenderThemeQt::paintButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
+{
+ QStyle* style = 0;
+ QPainter* painter = 0;
+ QWidget* widget = 0;
+
+ if (!stylePainterAndWidgetForPaintInfo(i, style, painter, widget))
+ return true;
+
+ QStyleOptionButton option;
+ option.initFrom(widget);
+ option.rect = r;
+
+ // Get the correct theme data for a button
+ EAppearance appearance = applyTheme(option, o);
+
+ if(appearance == PushButtonAppearance || appearance == ButtonAppearance)
+ style->drawControl(QStyle::CE_PushButton, &option, painter);
+ else if(appearance == RadioAppearance)
+ style->drawControl(QStyle::CE_RadioButton, &option, painter);
+ else if(appearance == CheckboxAppearance)
+ style->drawControl(QStyle::CE_CheckBox, &option, painter);
+
+ return false;
+}
+
+void RenderThemeQt::adjustTextFieldStyle(CSSStyleSelector*, RenderStyle* style, Element*) const
+{
+ addIntrinsicMargins(style);
+}
+
+bool RenderThemeQt::paintTextField(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)
+{
+ QStyle* style = 0;
+ QPainter* painter = 0;
+ QWidget* widget = 0;
+
+ if (!stylePainterAndWidgetForPaintInfo(i, style, painter, widget))
+ return true;
+
+ QStyleOption option;
+
+ // Get the correct theme data for a button
+ EAppearance appearance = applyTheme(option, o);
+ Q_ASSERT(appearance == TextFieldAppearance);
+
+ // Now paint the text field.
+ // TODO: this is not enough for sure! (use 'option'...)
+ painter->drawRect(r);
+
+ return false;
+}
+
+}
+
+// vim: ts=4 sw=4 et
git://git.webkit.org / WebKit-https.git / commitdiff