|
|
@ -48,11 +48,11 @@
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
/*
|
|
|
|
KHTML
|
|
|
|
TDEHTML
|
|
|
|
-----
|
|
|
|
-----
|
|
|
|
Srollbars:
|
|
|
|
Srollbars:
|
|
|
|
|
|
|
|
|
|
|
|
For some reason Scrollbars in KHTML seem to lose the bottom/left pixels. As if KHTML expects
|
|
|
|
For some reason Scrollbars in TDEHTML seem to lose the bottom/left pixels. As if TDEHTML expects
|
|
|
|
the scrollbar to be 1 pixel smaller/thinner than it actually is. To 'fix' this, the pixelMetric
|
|
|
|
the scrollbar to be 1 pixel smaller/thinner than it actually is. To 'fix' this, the pixelMetric
|
|
|
|
function will return 1 scrollbar with 1 greater than standard for form widgets, or where widget==0L
|
|
|
|
function will return 1 scrollbar with 1 greater than standard for form widgets, or where widget==0L
|
|
|
|
|
|
|
|
|
|
|
@ -451,7 +451,7 @@ static bool isKhtmlFormWidget(const TQWidget *widget)
|
|
|
|
|
|
|
|
|
|
|
|
// Copied from Keramik...
|
|
|
|
// Copied from Keramik...
|
|
|
|
|
|
|
|
|
|
|
|
//Form widgets are in the KHTMLView, but that has 2 further inner levels
|
|
|
|
//Form widgets are in the TDEHTMLView, but that has 2 further inner levels
|
|
|
|
//of widgets - TQClipperWidget, and outside of that, TQViewportWidget
|
|
|
|
//of widgets - TQClipperWidget, and outside of that, TQViewportWidget
|
|
|
|
TQWidget *potentialClipPort(widget ? widget->parentWidget() : 0L);
|
|
|
|
TQWidget *potentialClipPort(widget ? widget->parentWidget() : 0L);
|
|
|
|
|
|
|
|
|
|
|
@ -464,10 +464,10 @@ static bool isKhtmlFormWidget(const TQWidget *widget)
|
|
|
|
qstrcmp(potentialViewPort->name(), "qt_viewport"))
|
|
|
|
qstrcmp(potentialViewPort->name(), "qt_viewport"))
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
|
|
TQWidget *potentialKHTML(potentialViewPort->parentWidget());
|
|
|
|
TQWidget *potentialTDEHTML(potentialViewPort->parentWidget());
|
|
|
|
|
|
|
|
|
|
|
|
if (!potentialKHTML || potentialKHTML->isTopLevel() ||
|
|
|
|
if (!potentialTDEHTML || potentialTDEHTML->isTopLevel() ||
|
|
|
|
qstrcmp(potentialKHTML->className(), "KHTMLView"))
|
|
|
|
qstrcmp(potentialTDEHTML->className(), "TDEHTMLView"))
|
|
|
|
return false;
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
|
|
return true;
|
|
|
|
return true;
|
|
|
@ -2833,7 +2833,7 @@ void QtCurveStyle::drawBorder(const TQColor &bgnd, TQPainter *p, const TQRect &r
|
|
|
|
p->setPen(border);
|
|
|
|
p->setPen(border);
|
|
|
|
if(itsFormMode)
|
|
|
|
if(itsFormMode)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// If we're itsFormMode (KHTML) then we need to draw the aa borders using pixmaps
|
|
|
|
// If we're itsFormMode (TDEHTML) then we need to draw the aa borders using pixmaps
|
|
|
|
// - so we need to draw 2 pixels away from each corner (so that the alpha
|
|
|
|
// - so we need to draw 2 pixels away from each corner (so that the alpha
|
|
|
|
// blend lets through the background color...
|
|
|
|
// blend lets through the background color...
|
|
|
|
p->drawLine(r.x()+2, r.y(), r.x()+r.width()-3, r.y());
|
|
|
|
p->drawLine(r.x()+2, r.y(), r.x()+r.width()-3, r.y());
|
|
|
@ -2865,7 +2865,7 @@ void QtCurveStyle::drawBorder(const TQColor &bgnd, TQPainter *p, const TQRect &r
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// If we're not itsFormMode (ie. not KHTML) then we can just draw 1 pixel in - as
|
|
|
|
// If we're not itsFormMode (ie. not TDEHTML) then we can just draw 1 pixel in - as
|
|
|
|
// we can overwrite with the alpha colour.
|
|
|
|
// we can overwrite with the alpha colour.
|
|
|
|
p->drawLine(r.x()+1, r.y(), r.x()+r.width()-2, r.y());
|
|
|
|
p->drawLine(r.x()+1, r.y(), r.x()+r.width()-2, r.y());
|
|
|
|
p->drawLine(r.x()+1, r.y()+r.height()-1, r.x()+r.width()-2, r.y()+r.height()-1);
|
|
|
|
p->drawLine(r.x()+1, r.y()+r.height()-1, r.x()+r.width()-2, r.y()+r.height()-1);
|
|
|
@ -6178,7 +6178,7 @@ void QtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, cons
|
|
|
|
{
|
|
|
|
{
|
|
|
|
bool enable=!atMax;
|
|
|
|
bool enable=!atMax;
|
|
|
|
|
|
|
|
|
|
|
|
// See KHTML note at top of file
|
|
|
|
// See TDEHTML note at top of file
|
|
|
|
if(itsFormMode && SCROLLBAR_NEXT!=opts.scrollbarType) {
|
|
|
|
if(itsFormMode && SCROLLBAR_NEXT!=opts.scrollbarType) {
|
|
|
|
if(horiz) {
|
|
|
|
if(horiz) {
|
|
|
|
addline.addCoords(0, 0, -1, 0);
|
|
|
|
addline.addCoords(0, 0, -1, 0);
|
|
|
@ -6866,7 +6866,7 @@ int QtCurveStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementDat
|
|
|
|
case PM_SliderLength:
|
|
|
|
case PM_SliderLength:
|
|
|
|
return SLIDER_TRIANGULAR==opts.sliderStyle ? 11 : (SLIDER_SIZE+(ROTATED_SLIDER ? -2 : 6));
|
|
|
|
return SLIDER_TRIANGULAR==opts.sliderStyle ? 11 : (SLIDER_SIZE+(ROTATED_SLIDER ? -2 : 6));
|
|
|
|
case PM_ScrollBarExtent:
|
|
|
|
case PM_ScrollBarExtent:
|
|
|
|
// See KHTML note at top of file
|
|
|
|
// See TDEHTML note at top of file
|
|
|
|
return opts.sliderWidth+
|
|
|
|
return opts.sliderWidth+
|
|
|
|
(APP_KPRESENTER==itsThemedApp ||
|
|
|
|
(APP_KPRESENTER==itsThemedApp ||
|
|
|
|
((APP_KONQUEROR==itsThemedApp || APP_KONTACT==itsThemedApp) && (!widget || isFormWidget(widget)))
|
|
|
|
((APP_KONQUEROR==itsThemedApp || APP_KONTACT==itsThemedApp) && (!widget || isFormWidget(widget)))
|
|
|
@ -8781,7 +8781,7 @@ void QtCurveStyle::adjustScrollbarRects(bool &itsFormMode,
|
|
|
|
|
|
|
|
|
|
|
|
if(itsFormMode)
|
|
|
|
if(itsFormMode)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
// See KHTML note at top of file
|
|
|
|
// See TDEHTML note at top of file
|
|
|
|
if(horiz)
|
|
|
|
if(horiz)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
subline.addCoords(0, 0, 0, -1);
|
|
|
|
subline.addCoords(0, 0, 0, -1);
|
|
|
|