wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fixed misc nsNativeThemeQt rendering

Browse Source
This commit is contained in:
pekka.vanhoja 2008-04-19 19:07:29 +03:00
parent 8bc7b34f51
commit e6ce1a8872
2 changed files with 123 additions and 186 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

285
widget/src/qt/nsNativeThemeQt.cpp
View File

@ -22,6 +22,7 @@
* Lars Knoll <knoll@kde.org>
* Zack Rusin <zack@kde.org>
* Tim Hill (tim@prismelite.com)
* Vladimir Vukicevic <vladimir@pobox.com>
*
* Alternatively, the contents of this file may be used under the terms of
* either of the GNU General Public License Version 2 or later (the "GPL"),
@ -75,6 +76,7 @@ nsNativeThemeQt::nsNativeThemeQt()
{
combo = new QComboBox((QWidget *)0);
combo->resize(0, 0);
mNoBackgroundPalette.setColor(QPalette::Window, Qt::transparent);
ThemeChanged();
}
@ -101,23 +103,23 @@ nsNativeThemeQt::DrawWidgetBackground(nsIRenderingContext* aContext,
const nsRect& aRect,
const nsRect& aClipRect)
{
// qDebug("%s : %d", __PRETTY_FUNCTION__, IsDisabled(aFrame));
gfxContext* context = aContext->ThebesContext();
nsRefPtr<gfxASurface> surface = context->CurrentSurface();
context->UpdateSurfaceClip();
if (surface->GetType() != gfxASurface::SurfaceTypeQPainter)
return NS_ERROR_NOT_IMPLEMENTED;
gfxQPainterSurface* qSurface = (gfxQPainterSurface*) (surface.get());
QPainter* qPainter = qSurface->GetQPainter();
// qDebug("aWidgetType = %d", aWidgetType);
if (!qPainter)
NS_ASSERTION(qPainter, "Where'd my QPainter go?");
if (qPainter == nsnull)
return NS_OK;
QStyle* style = qApp->style();
// const QPalette::ColorGroup cg = qApp->palette().currentColorGroup();
qPainter->save();
@ -138,175 +140,114 @@ nsNativeThemeQt::DrawWidgetBackground(nsIRenderingContext* aContext,
QRect r = qRectInPixels(aRect, p2a);
QRect cr = qRectInPixels(aClipRect, p2a);
// qDebug("rect=%d %d %d %d\nr=%d %d %d %d",
// aRect.x, aRect.y, aRect.width, aRect.height,
// r.x(), r.y(), r.width(), r.height());
QStyle::PrimitiveElement pe = QStyle::PE_CustomBase;
QStyle::ControlElement ce = QStyle::CE_CustomBase;
QStyle::State eventFlags = QStyle::State_None;
/*IsDisabled(aFrame) ?
QStyle::State_None :
QStyle::State_Enabled;*/
PRInt32 eventState = GetContentState(aFrame, aWidgetType);
// qDebug("eventState = %d", eventState);
if (eventState & NS_EVENT_STATE_HOVER) {
// qDebug("NS_EVENT_STATE_HOVER");
eventFlags |= QStyle::State_MouseOver;
}
if (eventState & NS_EVENT_STATE_FOCUS) {
// qDebug("NS_EVENT_STATE_FOCUS");
eventFlags |= QStyle::State_HasFocus;
}
if (eventState & NS_EVENT_STATE_ACTIVE) {
// qDebug("NS_EVENT_STATE_ACTIVE");
eventFlags |= QStyle::State_DownArrow;
}
QStyle::State extraFlags = QStyle::State_None;
switch (aWidgetType) {
case NS_THEME_RADIO:
case NS_THEME_RADIO_SMALL: {
// qDebug("NS_THEME_RADIO");
ce = QStyle::CE_RadioButton;
QStyleOptionButton option;
ButtonStyle(aFrame, r, &option, eventFlags);
style->drawControl(ce, &option, qPainter, NULL);
break;
}
case NS_THEME_RADIO_SMALL:
case NS_THEME_CHECKBOX:
case NS_THEME_CHECKBOX_SMALL: {
// qDebug("NS_THEME_CHECKBOX");
QStyleOptionButton opt;
InitButtonStyle (aWidgetType, aFrame, r, opt);
ce = QStyle::CE_CheckBox;
if (aWidgetType == NS_THEME_CHECKBOX ||
aWidgetType == NS_THEME_CHECKBOX_SMALL)
{
style->drawPrimitive (QStyle::PE_IndicatorCheckBox, &opt, qPainter);
} else {
style->drawPrimitive (QStyle::PE_IndicatorRadioButton, &opt, qPainter);
}
break;
}
case NS_THEME_BUTTON:
case NS_THEME_BUTTON_BEVEL: {
QStyleOptionButton opt;
InitButtonStyle (aWidgetType, aFrame, r, opt);
QStyleOptionButton option;
ButtonStyle(aFrame, r, &option, eventFlags);
style->drawControl(ce, &option, qPainter, NULL);
if (aWidgetType == NS_THEME_BUTTON) {
style->drawPrimitive(QStyle::PE_PanelButtonCommand, &opt, qPainter);
if (IsDefaultButton(aFrame))
style->drawPrimitive(QStyle::PE_FrameDefaultButton, &opt, qPainter);
} else {
style->drawPrimitive(QStyle::PE_PanelButtonBevel, &opt, qPainter);
style->drawPrimitive(QStyle::PE_FrameButtonBevel, &opt, qPainter);
}
break;
}
case NS_THEME_SCROLLBAR: {
// qDebug("NS_THEME_SCROLLBAR");
qPainter->fillRect(r, qApp->palette().brush(QPalette::Active, QPalette::Background));
break;
}
case NS_THEME_SCROLLBAR_TRACK_HORIZONTAL: {
// qDebug("NS_THEME_SCROLLBAR_TRACK_HORIZONTAL");
qPainter->fillRect(r, qApp->palette().brush(QPalette::Active, QPalette::Background));
break;
}
case NS_THEME_SCROLLBAR_TRACK_VERTICAL: {
// qDebug("NS_THEME_SCROLLBAR_TRACK_VERTICAL");
qPainter->fillRect(r, qApp->palette().brush(QPalette::Active, QPalette::Background));
break;
}
case NS_THEME_SCROLLBAR_BUTTON_LEFT: {
// qDebug("NS_THEME_SCROLLBAR_BUTTON_LEFT");
eventFlags |= QStyle::State_Horizontal;
}
// Fall through
case NS_THEME_SCROLLBAR_BUTTON_LEFT:
extraFlags |= QStyle::State_Horizontal;
// fall through
case NS_THEME_SCROLLBAR_BUTTON_UP: {
// qDebug("NS_THEME_SCROLLBAR_BUTTON_UP");
ce = QStyle::CE_ScrollBarSubLine;
QStyleOption option;
InitPlainStyle(aWidgetType, aFrame, r, option, extraFlags);
PlainStyle(aFrame, r, &option, eventFlags);
style->drawControl(ce, &option, qPainter, NULL);
style->drawControl(QStyle::CE_ScrollBarSubLine, &option, qPainter, NULL);
break;
}
case NS_THEME_SCROLLBAR_BUTTON_RIGHT: {
// qDebug("NS_THEME_SCROLLBAR_BUTTON_RIGHT");
eventFlags |= QStyle::State_Horizontal;
}
// Fall through
case NS_THEME_SCROLLBAR_BUTTON_RIGHT:
extraFlags |= QStyle::State_Horizontal;
// fall through
case NS_THEME_SCROLLBAR_BUTTON_DOWN: {
// qDebug("NS_THEME_SCROLLBAR_BUTTON_DOWN");
ce = QStyle::CE_ScrollBarAddLine;
QStyleOption option;
InitPlainStyle(aWidgetType, aFrame, r, option, extraFlags);
PlainStyle(aFrame, r, &option, eventFlags);
style->drawControl(QStyle::CE_ScrollBarAddLine, &option, qPainter, NULL);
style->drawControl(ce, &option, qPainter, NULL);
break;
}
//case NS_THEME_SCROLLBAR_GRIPPER_HORIZONTAL:
//case NS_THEME_SCROLLBAR_GRIPPER_VERTICAL:
case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL: {
// qDebug("NS_THEME_SCROLLBAR_THUMB_HORIZONTAL");
eventFlags |= QStyle::State_Horizontal;
}
// Fall through
case NS_THEME_SCROLLBAR_THUMB_HORIZONTAL:
extraFlags |= QStyle::State_Horizontal;
// fall through
case NS_THEME_SCROLLBAR_THUMB_VERTICAL: {
// qDebug("NS_THEME_SCROLLBAR_THUMB_VERTICAL");
ce = QStyle::CE_ScrollBarSlider;
QStyleOption option;
InitPlainStyle(aWidgetType, aFrame, r, option, extraFlags);
PlainStyle(aFrame, r, &option, eventFlags);
style->drawControl(ce, &option, qPainter, NULL);
break;
}
case NS_THEME_BUTTON_BEVEL:
// qDebug("NS_THEME_BUTTON_BEVEL");
// ce = QStyle::CE_PushButtonBevel;
// flags |= QStyle::State_Raised;
break;
case NS_THEME_BUTTON: {
// qDebug("NS_THEME_BUTTON %d", IsDefaultButton(aFrame));
ce = QStyle::CE_PushButton;
eventFlags |= QStyle::State_Raised;
QStyleOptionButton option;
ButtonStyle(aFrame, r, &option, eventFlags);
style->drawControl(ce, &option, qPainter, NULL);
break;
style->drawControl(QStyle::CE_ScrollBarSlider, &option, qPainter, NULL);
}
case NS_THEME_DROPDOWN:
// qDebug("NS_THEME_DROPDOWN");
// style.drawComplexControl(QStyle::CC_ComboBox, qPainter, combo, r, cg, flags, QStyle::SC_ComboBoxFrame);
break;
case NS_THEME_DROPDOWN_BUTTON:
// qDebug("NS_THEME_DROPDOWN_BUTTON");
// r.translate(frameWidth, -frameWidth);
// r.setHeight(r.height() + 2*frameWidth);
// style.drawComplexControl(QStyle::CC_ComboBox, qPainter, combo, r, cg, flags, QStyle::SC_ComboBoxArrow);
break;
case NS_THEME_DROPDOWN_TEXT:
case NS_THEME_DROPDOWN_TEXTFIELD:
// qDebug("NS_THEME_DROPDOWN_TEXT");
break;
case NS_THEME_TEXTFIELD:
case NS_THEME_TEXTFIELD_MULTILINE:
case NS_THEME_LISTBOX: {
// qDebug("NS_THEME_TEXTFIELD");
pe = QStyle::PE_PanelLineEdit;
QStyleOption panelOpt;
QStyleOptionFrameV2 frameOpt;
QStyleOptionFrameV2 option;
if (!IsDisabled(aFrame)) {
panelOpt.state |= QStyle::State_Enabled;
frameOpt.state |= QStyle::State_Enabled;
}
panelOpt.rect = r;
FrameStyle(aFrame, r, &option, eventFlags);
frameOpt.rect = r;
frameOpt.features = QStyleOptionFrameV2::Flat;
frameOpt.palette = mNoBackgroundPalette;
style->drawPrimitive(pe, &option, qPainter, NULL);
style->drawPrimitive(QStyle::PE_PanelLineEdit, &panelOpt, qPainter, NULL);
style->drawPrimitive(QStyle::PE_FrameLineEdit, &frameOpt, qPainter, NULL);
break;
}
default:
@ -379,7 +320,7 @@ nsNativeThemeQt::GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* a
QStyleOptionButton option;
ButtonStyle(aFrame, qRect, &option);
InitButtonStyle(aWidgetType, aFrame, qRect, option);
QRect rect = s->subElementRect(
(aWidgetType == NS_THEME_CHECKBOX || aWidgetType == NS_THEME_CHECKBOX_SMALL ) ?
@ -399,7 +340,7 @@ nsNativeThemeQt::GetMinimumWidgetSize(nsIRenderingContext* aContext, nsIFrame* a
QStyleOptionButton option;
ButtonStyle(aFrame, qRect, &option);
InitButtonStyle(aWidgetType, aFrame, qRect, option);
QRect rect = s->subElementRect(
QStyle::SE_PushButtonFocusRect,
@ -557,66 +498,64 @@ nsNativeThemeQt::ThemeNeedsComboboxDropmarker()
return PR_FALSE;
}
void
nsNativeThemeQt::ButtonStyle(nsIFrame* aFrame,
QRect aRect,
QStyleOptionButton* aOption,
QStyle::State optFlags /*= QStyle::State_None*/)
nsNativeThemeQt::InitButtonStyle(PRUint8 aWidgetType,
nsIFrame* aFrame,
QRect rect,
QStyleOptionButton &opt)
{
QStyle::State flags = IsDisabled(aFrame) ?
QStyle::State_None :
QStyle::State_Enabled;
PRInt32 eventState = GetContentState(aFrame, aWidgetType);
flags |= IsChecked(aFrame) ?
QStyle::State_On :
QStyle::State_Off;
opt.rect = rect;
opt.palette = mNoBackgroundPalette;
flags |= optFlags;
PRBool disabled = IsDisabled(aFrame);
(*aOption).direction = QApplication::layoutDirection();
(*aOption).rect = aRect;
(*aOption).type = QStyleOption::SO_Button;
(*aOption).state = flags;
(*aOption).features = QStyleOptionButton::None;
if (!disabled)
opt.state |= QStyle::State_Enabled;
if (eventState & NS_EVENT_STATE_HOVER)
opt.state |= QStyle::State_MouseOver;
if (eventState & NS_EVENT_STATE_FOCUS)
opt.state |= QStyle::State_HasFocus;
if (!disabled && eventState & NS_EVENT_STATE_ACTIVE)
// Don't allow sunken when disabled
opt.state |= QStyle::State_Sunken;
switch (aWidgetType) {
case NS_THEME_RADIO:
case NS_THEME_RADIO_SMALL:
case NS_THEME_CHECKBOX:
case NS_THEME_CHECKBOX_SMALL:
if (IsChecked(aFrame))
opt.state |= QStyle::State_On;
else
opt.state |= QStyle::State_Off;
break;
default:
if (!(eventState & NS_EVENT_STATE_ACTIVE))
opt.state |= QStyle::State_Raised;
break;
}
}
void
nsNativeThemeQt::FrameStyle(nsIFrame* aFrame,
QRect aRect,
QStyleOptionFrameV2* aOption,
QStyle::State optFlags /*= QStyle::State_None*/)
nsNativeThemeQt::InitPlainStyle(PRUint8 aWidgetType,
nsIFrame* aFrame,
QRect rect,
QStyleOption &opt,
QStyle::State extraFlags)
{
QStyle::State flags = IsDisabled(aFrame) ?
QStyle::State_None :
QStyle::State_Enabled;
flags |= optFlags;
PRInt32 eventState = GetContentState(aFrame, aWidgetType);
(*aOption).direction = QApplication::layoutDirection();
(*aOption).rect = aRect;
(*aOption).type = QStyleOption::SO_Frame;
(*aOption).state = flags;
(*aOption).lineWidth = 1;
(*aOption).midLineWidth = 1;
(*aOption).features = QStyleOptionFrameV2::Flat;
}
void
nsNativeThemeQt::PlainStyle(nsIFrame* aFrame,
QRect aRect,
QStyleOption* aOption,
QStyle::State optFlags /*= QStyle::State_None*/)
{
QStyle::State flags = IsDisabled(aFrame) ?
QStyle::State_None :
QStyle::State_Enabled;
flags |= optFlags;
(*aOption).direction = QApplication::layoutDirection();
(*aOption).rect = aRect;
(*aOption).type = QStyleOption::SO_Default;
(*aOption).state = flags;
opt.rect = rect;
if (!IsDisabled(aFrame))
opt.state |= QStyle::State_Enabled;
if (eventState & NS_EVENT_STATE_HOVER)
opt.state |= QStyle::State_MouseOver;
if (eventState & NS_EVENT_STATE_FOCUS)
opt.state |= QStyle::State_HasFocus;
opt.state |= extraFlags;
}

24
widget/src/qt/nsNativeThemeQt.h
View File

@ -40,6 +40,7 @@
* ***** END LICENSE BLOCK ***** */
#include <QStyle>
#include <QPalette>
#include "nsITheme.h"
#include "nsCOMPtr.h"
@ -108,20 +109,16 @@ private:
return dctx->AppUnitsPerDevPixel();
}
void ButtonStyle(nsIFrame* aFrame,
QRect aRect,
QStyleOptionButton* aOption,
QStyle::State optFlags = QStyle::State_None);
void InitButtonStyle(PRUint8 widgetType,
nsIFrame* aFrame,
QRect rect,
QStyleOptionButton &opt);
void FrameStyle(nsIFrame* aFrame,
QRect aRect,
QStyleOptionFrameV2* aOption,
QStyle::State optFlags = QStyle::State_None);
void PlainStyle(nsIFrame* aFrame,
QRect aRect,
QStyleOption* aOption,
QStyle::State optFlags = QStyle::State_None);
void InitPlainStyle(PRUint8 aWidgetType,
nsIFrame* aFrame,
QRect rect,
QStyleOption &opt,
QStyle::State extraFlags = QStyle::State_None);
private:
@ -129,5 +126,6 @@ private:
PRInt32 frameWidth;
QPalette mNoBackgroundPalette;
};